From fb55647257d41857ab95b4ce696187991b8c3456 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jan 24 2021 22:53:17 +0000 Subject: Update to 6.2.2101 --- diff --git a/.gitignore b/.gitignore index c46dce4..f6726d4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /netgen-mesher-6.2.2007.tar.gz /netgen-mesher-6.2.2008.tar.gz /netgen-mesher-6.2.2009.tar.gz +/netgen-mesher-6.2.2101.tar.gz diff --git a/0002-Rename-libraries-add-library-versions.patch b/0002-Rename-libraries-add-library-versions.patch index 0e81632..d260b03 100644 --- a/0002-Rename-libraries-add-library-versions.patch +++ b/0002-Rename-libraries-add-library-versions.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2009/libsrc/csg/CMakeLists.txt netgen-6.2.2009-new/libsrc/csg/CMakeLists.txt ---- netgen-6.2.2009/libsrc/csg/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/csg/CMakeLists.txt 2020-11-12 15:24:29.025268926 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/csg/CMakeLists.txt netgen-6.2.2101-new/libsrc/csg/CMakeLists.txt +--- netgen-6.2.2101/libsrc/csg/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/csg/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -7,6 +7,10 @@ add_library(csg ${NG_LIB_TYPE} solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp zrefine.cpp python_csg.cpp splinesurface.cpp @@ -15,7 +15,7 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/csg/CMakeLists.txt netgen-6.2 @@ -21,6 +25,10 @@ target_link_libraries(csg PUBLIC ngcore) if(USE_GUI) add_library(csgvis ${NG_LIB_TYPE} vscsg.cpp ) - target_link_libraries(csgvis PRIVATE netgen_python PUBLIC ngcore) + target_link_libraries(csgvis PRIVATE "$" PUBLIC ngcore) + + set_target_properties(csgvis PROPERTIES OUTPUT_NAME "ngcsgvis") + set_target_properties(csgvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) @@ -23,9 +23,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/csg/CMakeLists.txt netgen-6.2 if(NOT WIN32) target_link_libraries(csgvis PUBLIC csg visual) if(APPLE) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/geom2d/CMakeLists.txt netgen-6.2.2009-new/libsrc/geom2d/CMakeLists.txt ---- netgen-6.2.2009/libsrc/geom2d/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/geom2d/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/geom2d/CMakeLists.txt netgen-6.2.2101-new/libsrc/geom2d/CMakeLists.txt +--- netgen-6.2.2101/libsrc/geom2d/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/geom2d/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -1,5 +1,7 @@ add_definitions(-DNGLIB_EXPORTS) add_library(geom2d ${NG_LIB_TYPE} csg2d.cpp genmesh2d.cpp geometry2d.cpp python_geom2d.cpp ) @@ -43,9 +43,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/geom2d/CMakeLists.txt netgen- if(NOT WIN32) target_link_libraries(geom2dvis PUBLIC geom2d) install( TARGETS geom2dvis ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/interface/CMakeLists.txt netgen-6.2.2009-new/libsrc/interface/CMakeLists.txt ---- netgen-6.2.2009/libsrc/interface/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/interface/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/interface/CMakeLists.txt netgen-6.2.2101-new/libsrc/interface/CMakeLists.txt +--- netgen-6.2.2101/libsrc/interface/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/interface/CMakeLists.txt 2021-01-24 22:34:32.529550110 +0100 @@ -9,6 +9,9 @@ add_library(interface ${NG_LIB_TYPE} target_link_libraries(interface PUBLIC mesh csg geom2d stl visual PRIVATE netgen_cgns) @@ -56,9 +56,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/interface/CMakeLists.txt netg if(NOT WIN32) install( TARGETS interface ${NG_INSTALL_DIR}) endif(NOT WIN32) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/meshing/CMakeLists.txt netgen-6.2.2009-new/libsrc/meshing/CMakeLists.txt ---- netgen-6.2.2009/libsrc/meshing/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/meshing/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/meshing/CMakeLists.txt netgen-6.2.2101-new/libsrc/meshing/CMakeLists.txt +--- netgen-6.2.2101/libsrc/meshing/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/meshing/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -17,6 +17,9 @@ add_library(mesh ${NG_LIB_TYPE} ${mesh_object_libs} ) @@ -69,9 +69,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/meshing/CMakeLists.txt netgen if(APPLE) set_target_properties( mesh PROPERTIES SUFFIX ".so") endif(APPLE) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/occ/CMakeLists.txt netgen-6.2.2009-new/libsrc/occ/CMakeLists.txt ---- netgen-6.2.2009/libsrc/occ/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/occ/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/occ/CMakeLists.txt netgen-6.2.2101-new/libsrc/occ/CMakeLists.txt +--- netgen-6.2.2101/libsrc/occ/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/occ/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -4,8 +4,12 @@ add_library(occ ${NG_LIB_TYPE} Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp python_occ.cpp @@ -85,9 +85,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/occ/CMakeLists.txt netgen-6.2 target_link_libraries(occvis PUBLIC ngcore) endif(USE_GUI) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2009-new/libsrc/stlgeom/CMakeLists.txt ---- netgen-6.2.2009/libsrc/stlgeom/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/stlgeom/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/stlgeom/CMakeLists.txt netgen-6.2.2101-new/libsrc/stlgeom/CMakeLists.txt +--- netgen-6.2.2101/libsrc/stlgeom/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/stlgeom/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -3,6 +3,10 @@ add_library(stl ${NG_LIB_TYPE} stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp python_stl.cpp ) @@ -102,7 +102,7 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/stlgeom/CMakeLists.txt netgen @@ -13,6 +17,10 @@ target_link_libraries( stl PUBLIC ngcore if(USE_GUI) add_library(stlvis ${NG_LIB_TYPE} vsstl.cpp) - target_link_libraries(stlvis PRIVATE netgen_python PUBLIC ngcore) + target_link_libraries(stlvis PRIVATE "$" PUBLIC ngcore) + + set_target_properties(stlvis PROPERTIES OUTPUT_NAME "ngstlvis") + set_target_properties(stlvis PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) @@ -110,9 +110,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/stlgeom/CMakeLists.txt netgen if(NOT WIN32) target_link_libraries( stlvis PUBLIC stl ) install( TARGETS stlvis ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2009/libsrc/visualization/CMakeLists.txt netgen-6.2.2009-new/libsrc/visualization/CMakeLists.txt ---- netgen-6.2.2009/libsrc/visualization/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/visualization/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/visualization/CMakeLists.txt netgen-6.2.2101-new/libsrc/visualization/CMakeLists.txt +--- netgen-6.2.2101/libsrc/visualization/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/visualization/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 @@ -8,6 +8,9 @@ else(USE_GUI) endif(USE_GUI) @@ -121,14 +121,14 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/visualization/CMakeLists.txt +set_target_properties(visual PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}) + - target_link_libraries( visual PUBLIC ngcore PRIVATE netgen_python ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ) + target_link_libraries( visual PUBLIC ngcore PRIVATE "$" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ) install( TARGETS visual ${NG_INSTALL_DIR}) -diff -rupN --no-dereference netgen-6.2.2009/ng/CMakeLists.txt netgen-6.2.2009-new/ng/CMakeLists.txt ---- netgen-6.2.2009/ng/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/ng/CMakeLists.txt 2020-11-12 15:24:29.026268925 +0100 -@@ -48,6 +48,9 @@ if(USE_GUI) +diff -rupN --no-dereference netgen-6.2.2101/ng/CMakeLists.txt netgen-6.2.2101-new/ng/CMakeLists.txt +--- netgen-6.2.2101/ng/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/ng/CMakeLists.txt 2021-01-24 22:34:32.530550103 +0100 +@@ -49,6 +49,9 @@ if(USE_GUI) endif(WIN32) - target_link_libraries( gui PRIVATE netgen_python ) + target_link_libraries( gui PRIVATE "$" ) + set_target_properties( gui PROPERTIES OUTPUT_NAME "nggui" ) + set_target_properties( gui PROPERTIES VERSION ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR} ) @@ -136,9 +136,9 @@ diff -rupN --no-dereference netgen-6.2.2009/ng/CMakeLists.txt netgen-6.2.2009-ne endif(USE_GUI) if(USE_PYTHON) -diff -rupN --no-dereference netgen-6.2.2009/ng/ng.tcl netgen-6.2.2009-new/ng/ng.tcl ---- netgen-6.2.2009/ng/ng.tcl 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/ng/ng.tcl 2020-11-12 15:24:29.027268923 +0100 +diff -rupN --no-dereference netgen-6.2.2101/ng/ng.tcl netgen-6.2.2101-new/ng/ng.tcl +--- netgen-6.2.2101/ng/ng.tcl 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/ng/ng.tcl 2021-01-24 22:34:32.530550103 +0100 @@ -2,7 +2,7 @@ catch {lappend auto_path $env(NETGENDIR) catch {lappend auto_path $env(NETGENDIR)/../lib } @@ -148,9 +148,9 @@ diff -rupN --no-dereference netgen-6.2.2009/ng/ng.tcl netgen-6.2.2009-new/ng/ng. } set batchmode [Ng_GetCommandLineParameter batchmode] -diff -rupN --no-dereference netgen-6.2.2009/ng/onetcl.cpp netgen-6.2.2009-new/ng/onetcl.cpp ---- netgen-6.2.2009/ng/onetcl.cpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/ng/onetcl.cpp 2020-11-12 15:24:29.028268922 +0100 +diff -rupN --no-dereference netgen-6.2.2101/ng/onetcl.cpp netgen-6.2.2101-new/ng/onetcl.cpp +--- netgen-6.2.2101/ng/onetcl.cpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/ng/onetcl.cpp 2021-01-24 22:34:32.531550095 +0100 @@ -3,7 +3,7 @@ DLL_HEADER const char * ngscript[] = {"" ,"catch {lappend auto_path $env(NETGENDIR) }\n" ,"catch {lappend auto_path $env(NETGENDIR)/../lib }\n" @@ -160,9 +160,9 @@ diff -rupN --no-dereference netgen-6.2.2009/ng/onetcl.cpp netgen-6.2.2009-new/ng ,"}\n" ,"set batchmode [Ng_GetCommandLineParameter batchmode]\n" ,"if {$batchmode==\"undefined\"} {\n" -diff -rupN --no-dereference netgen-6.2.2009/ng/Togl2.1/CMakeLists.txt netgen-6.2.2009-new/ng/Togl2.1/CMakeLists.txt ---- netgen-6.2.2009/ng/Togl2.1/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/ng/Togl2.1/CMakeLists.txt 2020-11-12 15:24:29.028268922 +0100 +diff -rupN --no-dereference netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt +--- netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt 2021-01-24 22:34:32.532550088 +0100 @@ -22,6 +22,9 @@ else(WIN32) add_library(togl togl.c toglProcAddr.c toglStubInit.c) @@ -173,9 +173,9 @@ diff -rupN --no-dereference netgen-6.2.2009/ng/Togl2.1/CMakeLists.txt netgen-6.2 endif(WIN32) target_link_libraries(togl ${OPENGL_LIBRARIES}) -diff -rupN --no-dereference netgen-6.2.2009/nglib/CMakeLists.txt netgen-6.2.2009-new/nglib/CMakeLists.txt ---- netgen-6.2.2009/nglib/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/nglib/CMakeLists.txt 2020-11-12 15:24:29.029268921 +0100 +diff -rupN --no-dereference netgen-6.2.2101/nglib/CMakeLists.txt netgen-6.2.2101-new/nglib/CMakeLists.txt +--- netgen-6.2.2101/nglib/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/nglib/CMakeLists.txt 2021-01-24 22:34:32.532550088 +0100 @@ -21,6 +21,7 @@ if(WIN32) endif(WIN32) @@ -184,9 +184,9 @@ diff -rupN --no-dereference netgen-6.2.2009/nglib/CMakeLists.txt netgen-6.2.2009 if(NOT WIN32) target_link_libraries( nglib PUBLIC mesh interface geom2d csg stl visual) if(USE_GUI) -diff -rupN --no-dereference netgen-6.2.2009/python/gui.py netgen-6.2.2009-new/python/gui.py ---- netgen-6.2.2009/python/gui.py 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/python/gui.py 2020-11-12 15:24:29.029268921 +0100 +diff -rupN --no-dereference netgen-6.2.2101/python/gui.py netgen-6.2.2101-new/python/gui.py +--- netgen-6.2.2101/python/gui.py 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/python/gui.py 2021-01-24 22:34:32.532550088 +0100 @@ -8,7 +8,7 @@ def StartGUI(): win.tk.eval('lappend ::auto_path ' + netgen._netgen_lib_dir) win.tk.eval('lappend ::auto_path ' + netgen._netgen_bin_dir) diff --git a/0004-Make-some-includes-relative.patch b/0004-Make-some-includes-relative.patch index b9ad630..11fcf0b 100644 --- a/0004-Make-some-includes-relative.patch +++ b/0004-Make-some-includes-relative.patch @@ -1,18 +1,18 @@ -diff -rupN --no-dereference netgen-6.2.2009/libsrc/include/meshing.hpp netgen-6.2.2009-new/libsrc/include/meshing.hpp ---- netgen-6.2.2009/libsrc/include/meshing.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/include/meshing.hpp 2020-11-12 15:24:29.094268845 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/include/meshing.hpp netgen-6.2.2101-new/libsrc/include/meshing.hpp +--- netgen-6.2.2101/libsrc/include/meshing.hpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/include/meshing.hpp 2021-01-24 22:34:32.577549762 +0100 @@ -1 +1 @@ -#include <../meshing/meshing.hpp> +#include "../meshing/meshing.hpp" -diff -rupN --no-dereference netgen-6.2.2009/libsrc/include/myadt.hpp netgen-6.2.2009-new/libsrc/include/myadt.hpp ---- netgen-6.2.2009/libsrc/include/myadt.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/include/myadt.hpp 2020-11-12 15:24:29.095268844 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/include/myadt.hpp netgen-6.2.2101-new/libsrc/include/myadt.hpp +--- netgen-6.2.2101/libsrc/include/myadt.hpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/include/myadt.hpp 2021-01-24 22:34:32.577549762 +0100 @@ -1 +1 @@ -#include <../general/myadt.hpp> +#include "../general/myadt.hpp" -diff -rupN --no-dereference netgen-6.2.2009/libsrc/include/stlgeom.hpp netgen-6.2.2009-new/libsrc/include/stlgeom.hpp ---- netgen-6.2.2009/libsrc/include/stlgeom.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/include/stlgeom.hpp 2020-11-12 15:24:29.095268844 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/include/stlgeom.hpp netgen-6.2.2101-new/libsrc/include/stlgeom.hpp +--- netgen-6.2.2101/libsrc/include/stlgeom.hpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/include/stlgeom.hpp 2021-01-24 22:34:32.577549762 +0100 @@ -1 +1 @@ -#include <../stlgeom/stlgeom.hpp> +#include "../stlgeom/stlgeom.hpp" diff --git a/0009-immintrin.patch b/0009-immintrin.patch deleted file mode 100644 index b585860..0000000 --- a/0009-immintrin.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/taskmanager.cpp netgen-6.2.2009-new/libsrc/core/taskmanager.cpp ---- netgen-6.2.2009/libsrc/core/taskmanager.cpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/core/taskmanager.cpp 2020-11-12 15:24:29.155268774 +0100 -@@ -201,14 +201,22 @@ namespace ngcore - ; - } - -+#if defined(__i386__) || defined(__x86_64__) - static size_t calibrate_init_tsc = __rdtsc(); -+#else -+ static size_t calibrate_init_tsc = clock(); -+#endif - typedef std::chrono::system_clock TClock; - static TClock::time_point calibrate_init_clock = TClock::now(); - - void TaskManager :: StopWorkers() - { - done = true; -+#if defined(__i386__) || defined(__x86_64__) - double delta_tsc = __rdtsc()-calibrate_init_tsc; -+#else -+ double delta_tsc = clock()-calibrate_init_tsc; -+#endif - double delta_sec = std::chrono::duration(TClock::now()-calibrate_init_clock).count(); - double frequ = (delta_sec != 0) ? delta_tsc/delta_sec : 2.7e9; - -@@ -420,8 +428,10 @@ namespace ngcore - for (int j = 0; j < num_nodes; j++) - if (workers_on_node[j]) - { -+#if defined(__i386__) || defined(__x86_64__) - while (complete[j] != jobnr) -- _mm_pause(); -+ _mm_pause();; -+#endif - } - - func = nullptr; -diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/utils.cpp netgen-6.2.2009-new/libsrc/core/utils.cpp ---- netgen-6.2.2009/libsrc/core/utils.cpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/core/utils.cpp 2020-11-12 15:24:29.155268774 +0100 -@@ -35,6 +35,7 @@ namespace ngcore - - double seconds_per_tick = [] () noexcept - { -+#if defined(__i386__) || defined(__x86_64__) - auto tick_start = GetTimeCounter(); - double tstart = WallTime(); - double tend = WallTime()+0.001; -@@ -46,6 +47,9 @@ namespace ngcore - tend = WallTime(); - - return (tend-tstart)/static_cast(tick_end-tick_start); -+#else -+ return 1. / CLOCKS_PER_SEC; -+#endif - }(); - - const std::chrono::time_point wall_time_start = TClock::now(); -diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/utils.hpp netgen-6.2.2009-new/libsrc/core/utils.hpp ---- netgen-6.2.2009/libsrc/core/utils.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/core/utils.hpp 2020-11-12 15:24:29.155268774 +0100 -@@ -11,7 +11,11 @@ - #ifdef WIN32 - #include // for __rdtsc() CPU time step counter - #else --#include // for __rdtsc() CPU time step counter -+#if defined(__i386__) || defined(__x86_64__) -+# include // for __rdtsc() CPU time step counter -+#else -+# include -+#endif - #endif // WIN32 - - #include "ngcore_api.hpp" // for NGCORE_API -@@ -52,7 +56,11 @@ namespace ngcore - - inline TTimePoint GetTimeCounter() noexcept - { -+#if defined(__i386__) || defined(__x86_64__) - return TTimePoint(__rdtsc()); -+#else -+ return TTimePoint(clock()); -+#endif - } - - template -@@ -161,7 +169,9 @@ namespace ngcore - while (!m.compare_exchange_weak(should, true)) - { - should = false; -+#if defined(__i386__) || defined(__x86_64__) - _mm_pause(); -+#endif - } - } - void unlock() -diff -rupN --no-dereference netgen-6.2.2009/libsrc/general/ngsimd.hpp netgen-6.2.2009-new/libsrc/general/ngsimd.hpp ---- netgen-6.2.2009/libsrc/general/ngsimd.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/general/ngsimd.hpp 2020-11-12 15:24:29.155268774 +0100 -@@ -6,7 +6,9 @@ - /* Date: 25. Mar. 16 */ - /**************************************************************************/ - --#include -+#if defined(__i386__) || defined(__x86_64__) -+# include -+#endif - #include - #include - #include diff --git a/0010-rename-netgen-binary.patch b/0010-rename-netgen-binary.patch index fc4b364..dbdae56 100644 --- a/0010-rename-netgen-binary.patch +++ b/0010-rename-netgen-binary.patch @@ -1,11 +1,11 @@ -diff -rupN --no-dereference netgen-6.2.2009/ng/CMakeLists.txt netgen-6.2.2009-new/ng/CMakeLists.txt ---- netgen-6.2.2009/ng/CMakeLists.txt 2020-11-12 15:24:29.090268850 +0100 -+++ netgen-6.2.2009-new/ng/CMakeLists.txt 2020-11-12 15:24:29.210268709 +0100 -@@ -23,6 +23,7 @@ if(USE_GUI) +diff -rupN --no-dereference netgen-6.2.2101/ng/CMakeLists.txt netgen-6.2.2101-new/ng/CMakeLists.txt +--- netgen-6.2.2101/ng/CMakeLists.txt 2021-01-24 22:34:32.573549791 +0100 ++++ netgen-6.2.2101-new/ng/CMakeLists.txt 2021-01-24 22:34:32.618549464 +0100 +@@ -21,6 +21,7 @@ if(USE_GUI) ) add_executable(netgen ngappinit.cpp) + set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen-mesher) - - target_link_libraries( gui PUBLIC nglib ) - target_link_libraries( gui PRIVATE ${LIBTOGL} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${X11_Xmu_LIB} ${X11_X11_LIB} ${OCC_LIBRARIES} ) + if(WIN32) + target_sources(netgen PRIVATE ../windows/netgen.rc) + endif(WIN32) diff --git a/0011-system-pybind11.patch b/0011-system-pybind11.patch index 991cb7a..7f49aa3 100644 --- a/0011-system-pybind11.patch +++ b/0011-system-pybind11.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2009/cmake/SuperBuild.cmake netgen-6.2.2009-new/cmake/SuperBuild.cmake ---- netgen-6.2.2009/cmake/SuperBuild.cmake 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/cmake/SuperBuild.cmake 2020-11-12 15:24:29.261268650 +0100 +diff -rupN --no-dereference netgen-6.2.2101/cmake/SuperBuild.cmake netgen-6.2.2101-new/cmake/SuperBuild.cmake +--- netgen-6.2.2101/cmake/SuperBuild.cmake 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/cmake/SuperBuild.cmake 2021-01-24 22:34:32.660549160 +0100 @@ -38,7 +38,7 @@ endif(NOT WIN32) ####################################################################### @@ -10,10 +10,10 @@ diff -rupN --no-dereference netgen-6.2.2009/cmake/SuperBuild.cmake netgen-6.2.20 set(NG_INSTALL_PYBIND ON) if( NOT PYBIND_INCLUDE_DIR ) # if the pybind submodule is missing, try to initialize and update all submodules -diff -rupN --no-dereference netgen-6.2.2009/CMakeLists.txt netgen-6.2.2009-new/CMakeLists.txt ---- netgen-6.2.2009/CMakeLists.txt 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/CMakeLists.txt 2020-11-12 15:24:29.261268650 +0100 -@@ -267,7 +267,7 @@ else() +diff -rupN --no-dereference netgen-6.2.2101/CMakeLists.txt netgen-6.2.2101-new/CMakeLists.txt +--- netgen-6.2.2101/CMakeLists.txt 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/CMakeLists.txt 2021-01-24 22:34:32.660549160 +0100 +@@ -268,7 +268,7 @@ else() endif() if (USE_PYTHON) @@ -22,7 +22,7 @@ diff -rupN --no-dereference netgen-6.2.2009/CMakeLists.txt netgen-6.2.2009-new/C find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) if( PYBIND_INCLUDE_DIR ) message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}") -@@ -281,10 +281,6 @@ if (USE_PYTHON) +@@ -282,10 +282,6 @@ if (USE_PYTHON) target_link_libraries(netgen_python INTERFACE ${PYTHON_LIBRARIES}) endif() diff --git a/0012-cmake_fixes.patch b/0012-cmake_fixes.patch index 126192c..43f0b7b 100644 --- a/0012-cmake_fixes.patch +++ b/0012-cmake_fixes.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference netgen-6.2.2009/CMakeLists.txt netgen-6.2.2009-new/CMakeLists.txt ---- netgen-6.2.2009/CMakeLists.txt 2020-11-12 15:24:29.312268590 +0100 -+++ netgen-6.2.2009-new/CMakeLists.txt 2020-11-12 15:24:29.366268527 +0100 -@@ -53,14 +53,14 @@ if(INSTALL_DIR) +diff -rupN --no-dereference netgen-6.2.2101/CMakeLists.txt netgen-6.2.2101-new/CMakeLists.txt +--- netgen-6.2.2101/CMakeLists.txt 2021-01-24 22:34:32.701548862 +0100 ++++ netgen-6.2.2101-new/CMakeLists.txt 2021-01-24 22:34:32.747548528 +0100 +@@ -54,14 +54,14 @@ if(INSTALL_DIR) set(INSTALL_DIR_DEFAULT ${INSTALL_DIR}) endif(INSTALL_DIR) diff --git a/netgen-mesher.spec b/netgen-mesher.spec index ee5abe6..3800af1 100644 --- a/netgen-mesher.spec +++ b/netgen-mesher.spec @@ -17,8 +17,8 @@ %global build_openmpi 1 Name: netgen-mesher -Version: 6.2.2009 -Release: 2%{?dist} +Version: 6.2.2101 +Release: 1%{?dist} Summary: Automatic mesh generation tool License: LGPLv2 @@ -33,19 +33,16 @@ Source100: https://raw.githubusercontent.com/NGSolve/pybind11/7ec2ddfc95f65 Patch1: 0002-Rename-libraries-add-library-versions.patch # Make some includes relative (needed for when headers are in -private subpackage) Patch2: 0004-Make-some-includes-relative.patch -# Only include immintrin.h on x86 arches -# Fall back to clock() instead of rdtsc on non x86 arches -Patch3: 0009-immintrin.patch # Rename binary in cmake so that exported modules work correctly -Patch4: 0010-rename-netgen-binary.patch +Patch3: 0010-rename-netgen-binary.patch # Allow using system pybind11 -Patch5: 0011-system-pybind11.patch +Patch4: 0011-system-pybind11.patch # Workaround "CMake Error: install(EXPORT "netgen-targets" ...) includes target "gui" which requires target "togl" that is not in the export set." -Patch6: netgen_install-togl.patch +Patch5: netgen_install-togl.patch # Project checks for ability to write to the install location which breaks DESTDIR -Patch7: 0012-cmake_fixes.patch +Patch6: 0012-cmake_fixes.patch # Fix function redefinition due to sizet being equal to unsigned int on non 64bit arches -Patch8: netgen_sizet.patch +Patch7: netgen_sizet.patch @@ -392,6 +389,9 @@ install -Dpm 0644 nglib/nglib.h %{buildroot}%{_includedir}/%{name}/nglib.h %changelog +* Sun Jan 24 2021 Sandro Mani - 6.2.2101-1 +- Update to 6.2.2101 + * Thu Nov 26 2020 Richard Shaw - 6.2.2009-2 - Rebuild for OCC 7.5.0 side-tag. diff --git a/netgen_install-togl.patch b/netgen_install-togl.patch index 2c0f406..312295d 100644 --- a/netgen_install-togl.patch +++ b/netgen_install-togl.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2009/ng/Togl2.1/CMakeLists.txt netgen-6.2.2009-new/ng/Togl2.1/CMakeLists.txt ---- netgen-6.2.2009/ng/Togl2.1/CMakeLists.txt 2020-11-12 15:24:29.091268849 +0100 -+++ netgen-6.2.2009-new/ng/Togl2.1/CMakeLists.txt 2020-11-12 15:24:29.314268588 +0100 +diff -rupN --no-dereference netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt +--- netgen-6.2.2101/ng/Togl2.1/CMakeLists.txt 2021-01-24 22:34:32.575549776 +0100 ++++ netgen-6.2.2101-new/ng/Togl2.1/CMakeLists.txt 2021-01-24 22:34:32.703548847 +0100 @@ -25,6 +25,8 @@ else(WIN32) set_target_properties(togl PROPERTIES OUTPUT_NAME "ngtogl") diff --git a/netgen_sizet.patch b/netgen_sizet.patch index 351561c..2c533de 100644 --- a/netgen_sizet.patch +++ b/netgen_sizet.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/python_ngcore.hpp netgen-6.2.2009-new/libsrc/core/python_ngcore.hpp ---- netgen-6.2.2009/libsrc/core/python_ngcore.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/core/python_ngcore.hpp 2020-11-12 15:24:29.423268461 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/core/python_ngcore.hpp netgen-6.2.2101-new/libsrc/core/python_ngcore.hpp +--- netgen-6.2.2101/libsrc/core/python_ngcore.hpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/core/python_ngcore.hpp 2021-01-24 22:34:32.792548202 +0100 @@ -107,10 +107,12 @@ namespace ngcore static std::string GetName() { return "D"; } }; @@ -14,9 +14,9 @@ diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/python_ngcore.hpp netgen template struct PyNameTraits> { -diff -rupN --no-dereference netgen-6.2.2009/libsrc/core/table.hpp netgen-6.2.2009-new/libsrc/core/table.hpp ---- netgen-6.2.2009/libsrc/core/table.hpp 2020-11-11 17:40:06.000000000 +0100 -+++ netgen-6.2.2009-new/libsrc/core/table.hpp 2020-11-12 15:24:29.424268459 +0100 +diff -rupN --no-dereference netgen-6.2.2101/libsrc/core/table.hpp netgen-6.2.2101-new/libsrc/core/table.hpp +--- netgen-6.2.2101/libsrc/core/table.hpp 2021-01-15 15:50:18.000000000 +0100 ++++ netgen-6.2.2101-new/libsrc/core/table.hpp 2021-01-24 22:34:32.792548202 +0100 @@ -101,8 +101,10 @@ namespace ngcore { return TablePrefixSum32 (FlatArray (entrysize.Size(), (unsigned int*)(int*)(entrysize.Addr(0)))); } NETGEN_INLINE size_t * TablePrefixSum (FlatArray> entrysize) diff --git a/sources b/sources index aebf7f7..1fc8dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netgen-mesher-6.2.2009.tar.gz) = 20462a543f5c84d2477da179445d5222b1a2d8107c65b8939389b00fdf2c1787dd8be82ee7ce4d603a3f12e1ac349c370f3d3ace08655515620d866f8ee04d1a +SHA512 (netgen-mesher-6.2.2101.tar.gz) = a9349f6a24d0d8a9babbed5232a87999f1e9988422d92919286dc4291a63c317d377a9338f6122f0a04b0e1c39adb8fb6591e717ea3240c1624c6c7883289f6d