-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Netgen: init at 6.2.2405 #355445
Closed
Closed
Netgen: init at 6.2.2405 #355445
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
pkgs/by-name/ne/netgen/conditional-arm-feature-complex.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/libsrc/core/simd_arm64.hpp b/libsrc/core/simd_arm64.hpp | ||
index 9e0bcce..3607c4f 100644 | ||
--- a/libsrc/core/simd_arm64.hpp | ||
+++ b/libsrc/core/simd_arm64.hpp | ||
@@ -153,7 +153,7 @@ namespace ngcore | ||
{ | ||
return FNMA(SIMD<double,2> (a), b, c); | ||
} | ||
- | ||
+#ifdef __ARM_FEATURE_COMPLEX | ||
// ARM complex mult: | ||
// https://arxiv.org/pdf/1901.07294.pdf | ||
// c += a*b (a0re, a0im, a1re, a1im, ...), | ||
@@ -162,7 +162,7 @@ namespace ngcore | ||
auto tmp = vcmlaq_f64(c.Data(), a.Data(), b.Data()); // are * b | ||
c = vcmlaq_rot90_f64(tmp, a.Data(), b.Data()); // += i*aim * b | ||
} | ||
- | ||
+#endif | ||
|
||
NETGEN_INLINE SIMD<double,2> operator+ (SIMD<double,2> a, SIMD<double,2> b) | ||
{ return a.Data()+b.Data(); } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cmake/generate_version_file.cmake b/cmake/generate_version_file.cmake | ||
index 780c287b..e84461cc 100644 | ||
--- a/cmake/generate_version_file.cmake | ||
+++ b/cmake/generate_version_file.cmake | ||
@@ -5,7 +5,7 @@ endif() | ||
if(NETGEN_VERSION_GIT) | ||
set(git_version_string ${NETGEN_VERSION_GIT}) | ||
else() | ||
- find_package(Git REQUIRED) | ||
+ find_package(Git) | ||
execute_process(COMMAND git describe --tags --match "v[0-9]*" --long --dirty | ||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} | ||
OUTPUT_VARIABLE git_version_string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt | ||
index c95c4430..7480f6b7 100644 | ||
--- a/python/CMakeLists.txt | ||
+++ b/python/CMakeLists.txt | ||
@@ -43,7 +43,7 @@ else() | ||
else() | ||
message("-- Found pybind11-stubgen version: ${stubgen_version}") | ||
install(CODE "\ | ||
- set(ENV{PYTHONPATH} ${CMAKE_INSTALL_PREFIX}/${NG_INSTALL_DIR_PYTHON})\n \ | ||
+ set(ENV{PYTHONPATH} ${CMAKE_INSTALL_PREFIX}/${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH})\n \ | ||
execute_process(COMMAND ${Python3_EXECUTABLE} -m pybind11_stubgen --ignore-all-errors netgen)\n \ | ||
execute_process(COMMAND ${Python3_EXECUTABLE} -m pybind11_stubgen --ignore-all-errors pyngcore)\n \ | ||
") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,192 @@ | ||||||||||
{ | ||||||||||
lib, | ||||||||||
stdenv, | ||||||||||
fetchFromGitHub, | ||||||||||
fetchDebianPatch, | ||||||||||
makeWrapper, | ||||||||||
cmake, | ||||||||||
python3, | ||||||||||
python3Packages, | ||||||||||
mpi, | ||||||||||
mpiCheckPhaseHook, | ||||||||||
metis, | ||||||||||
opencascade-occt, | ||||||||||
libGLU, | ||||||||||
zlib, | ||||||||||
tcl, | ||||||||||
tk, | ||||||||||
xorg, | ||||||||||
libjpeg, | ||||||||||
ffmpeg, | ||||||||||
catch2, | ||||||||||
avxSupport ? stdenv.hostPlatform.avxSupport, | ||||||||||
avx2Support ? stdenv.hostPlatform.avx2Support, | ||||||||||
avx512Support ? stdenv.hostPlatform.avx512Support, | ||||||||||
}: | ||||||||||
let | ||||||||||
archFlags = toString ( | ||||||||||
lib.optional avxSupport "-mavx" | ||||||||||
++ lib.optional avx2Support "-mavx2" | ||||||||||
++ lib.optional avx512Support "-mavx512" | ||||||||||
); | ||||||||||
in | ||||||||||
stdenv.mkDerivation (finalAttrs: { | ||||||||||
pname = "netgen"; | ||||||||||
version = "6.2.2405"; | ||||||||||
__structuredAttrs = true; | ||||||||||
|
||||||||||
src = fetchFromGitHub { | ||||||||||
owner = "ngsolve"; | ||||||||||
repo = "netgen"; | ||||||||||
rev = "v${finalAttrs.version}"; | ||||||||||
hash = "sha256-y0Vol8vpccktiqOolRrAbw7JWF4o8Nh9t/fcDnBOWXE="; | ||||||||||
}; | ||||||||||
|
||||||||||
patches = [ | ||||||||||
# disable some platform specified code used by downstream ngsolve | ||||||||||
# can be enabled with -march=armv8.3-a+simd when compiling ngsolve | ||||||||||
# note compiling netgen itself is not influenced by this feature | ||||||||||
./conditional-arm-feature-complex.patch | ||||||||||
|
||||||||||
# when generating python stub file utilizing system python pybind11_stubgen module | ||||||||||
# cmake need to inherit pythonpath | ||||||||||
./inherit-env-pythonpath.patch | ||||||||||
|
||||||||||
./find-git-not-mendatory.patch | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "fix-national-encoding.patch"; | ||||||||||
hash = "sha256-oo29H/SN+c/yojtEkFUG99Gc+hJd5sNxZfxV5TzPtRY="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "fix_nggui_tcl.patch"; | ||||||||||
hash = "sha256-ODDT67+RWBzPhhq/equWsu78x9L/Yrs3U8VQ1Uu0zZw="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "ffmpeg_link_libraries.patch"; | ||||||||||
hash = "sha256-S02OPH9hbJjOnBm6JMh6uM5XptcubV24vdyEF0FusoM="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "size_t_int32.patch"; | ||||||||||
hash = "sha256-uudf3b97J2TNq4lAzPK1bRrcQv+Z1oVxFE3tKlydJfE="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "link_atomic.patch"; | ||||||||||
hash = "sha256-Yf0GNP4BAahWxOO0zIMVvXiROVP0hRM54Fok7jGABlY="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "include_stdlib.patch"; | ||||||||||
hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc="; | ||||||||||
}) | ||||||||||
(fetchDebianPatch { | ||||||||||
inherit (finalAttrs) pname; | ||||||||||
version = "6.2.2404+dfsg1-4"; | ||||||||||
patch = "ngappinit_no_MPI.patch"; | ||||||||||
hash = "sha256-0PSe5YB0C/goYFvnl9Z+pwM12D4s1qaTRV12/NA7c94="; | ||||||||||
}) | ||||||||||
]; | ||||||||||
|
||||||||||
postPatch = '' | ||||||||||
# get version via version.txt rather than git describe | ||||||||||
echo "v${finalAttrs.version}-0" > version.txt | ||||||||||
# create dummy catch2 target and use system catch2 | ||||||||||
echo "add_custom_target(project_catch)" > cmake/external_projects/catch.cmake | ||||||||||
Comment on lines
+103
to
+104
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should also make this a patch. |
||||||||||
''; | ||||||||||
|
||||||||||
nativeBuildInputs = [ | ||||||||||
cmake | ||||||||||
makeWrapper | ||||||||||
python3Packages.pybind11-stubgen | ||||||||||
]; | ||||||||||
|
||||||||||
buildInputs = [ | ||||||||||
metis | ||||||||||
opencascade-occt | ||||||||||
zlib | ||||||||||
tcl | ||||||||||
tk | ||||||||||
libGLU | ||||||||||
xorg.libXmu | ||||||||||
libjpeg | ||||||||||
ffmpeg | ||||||||||
mpi | ||||||||||
]; | ||||||||||
|
||||||||||
propagatedBuildInputs = with python3Packages; [ | ||||||||||
packaging | ||||||||||
pybind11 | ||||||||||
mpi4py | ||||||||||
numpy | ||||||||||
]; | ||||||||||
|
||||||||||
cmakeFlags = [ | ||||||||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" archFlags) | ||||||||||
(lib.cmakeBool "USE_MPI" true) | ||||||||||
(lib.cmakeBool "USE_MPI4PY" true) | ||||||||||
(lib.cmakeBool "PREFER_SYSTEM_PYBIND11" true) | ||||||||||
(lib.cmakeBool "BUILD_STUB_FILES" true) | ||||||||||
(lib.cmakeBool "USE_SUPERBUILD" false) # use system packages | ||||||||||
(lib.cmakeBool "USE_NATIVE_ARCH" false) | ||||||||||
(lib.cmakeBool "USE_JPEG" true) | ||||||||||
(lib.cmakeBool "USE_MPEG" true) | ||||||||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doInstallCheck) | ||||||||||
(lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck) | ||||||||||
Comment on lines
+143
to
+144
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Unit tests are not |
||||||||||
]; | ||||||||||
|
||||||||||
# netgen use tcl script and need to be aware of NETGENDIR | ||||||||||
postInstall = '' | ||||||||||
wrapProgram "$out/bin/netgen" --set NETGENDIR "$out/bin" | ||||||||||
''; | ||||||||||
|
||||||||||
preInstallCheck = '' | ||||||||||
export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH | ||||||||||
''; | ||||||||||
|
||||||||||
# mesh generation differs on x86_64 and aarch64 platform | ||||||||||
# tests will fail on aarch64 platform | ||||||||||
doInstallCheck = !stdenv.hostPlatform.isAarch64; | ||||||||||
|
||||||||||
installCheckTarget = "test"; | ||||||||||
|
||||||||||
nativeInstallCheckInputs = [ | ||||||||||
catch2 | ||||||||||
python3Packages.pytest | ||||||||||
python3Packages.pytest-check | ||||||||||
python3Packages.pytest-mpi | ||||||||||
mpiCheckPhaseHook | ||||||||||
]; | ||||||||||
|
||||||||||
passthru = { | ||||||||||
inherit avxSupport avx2Support avx512Support; | ||||||||||
}; | ||||||||||
|
||||||||||
meta = { | ||||||||||
homepage = "https://ngsolve.org"; | ||||||||||
description = "Atomatic 3d tetrahedral mesh generator"; | ||||||||||
license = with lib.licenses; [ | ||||||||||
lgpl2Plus | ||||||||||
lgpl21Plus | ||||||||||
lgpl21Only | ||||||||||
bsd3 | ||||||||||
boost | ||||||||||
publicDomain | ||||||||||
]; | ||||||||||
platforms = [ | ||||||||||
"x86_64-linux" | ||||||||||
"aarch64-linux" | ||||||||||
]; | ||||||||||
mainProgram = "netgen"; | ||||||||||
maintainers = with lib.maintainers; [ qbisi ]; | ||||||||||
}; | ||||||||||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we simply set
NETGEN_VERSION_GIT
in cmake flags?