From 4c535a2037826e66e4b112a069b3723b6baf893f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 2 Nov 2022 20:23:19 +0100 Subject: update: damask3.0.0-alpha7 (#33634) * damask3.0.0-alpha7 * [@spackbot] updating style on behalf of MarDiehl Co-authored-by: MarDiehl --- .../builtin/packages/damask-grid/long-lines.patch | 21 +++++++++++++++++++++ .../repos/builtin/packages/damask-grid/package.py | 9 ++++++++- .../builtin/packages/damask-mesh/long-lines.patch | 21 +++++++++++++++++++++ .../repos/builtin/packages/damask-mesh/package.py | 6 ++++++ var/spack/repos/builtin/packages/damask/package.py | 5 +++++ .../repos/builtin/packages/py-damask/package.py | 5 +++++ .../repos/builtin/packages/py-damask/setup.patch | 11 +++++++++++ 7 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/damask-grid/long-lines.patch create mode 100644 var/spack/repos/builtin/packages/damask-mesh/long-lines.patch create mode 100644 var/spack/repos/builtin/packages/py-damask/setup.patch diff --git a/var/spack/repos/builtin/packages/damask-grid/long-lines.patch b/var/spack/repos/builtin/packages/damask-grid/long-lines.patch new file mode 100644 index 0000000000..b3e0f962ab --- /dev/null +++ b/var/spack/repos/builtin/packages/damask-grid/long-lines.patch @@ -0,0 +1,21 @@ +--- damask.orig/src/CMakeLists.txt 2022-10-10 11:15:50.430977247 +0200 ++++ damask/src/CMakeLists.txt 2022-10-10 11:26:53.792092659 +0200 +@@ -2,6 +2,9 @@ + if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") + # long lines for interaction matrix + set_source_files_properties("lattice.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") ++ # CHKERRQ PETSc macro ++ set_source_files_properties("parallelization.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") ++ set_source_files_properties("quit.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") + endif() + + file(GLOB damask-sources CONFIGURE_DEPENDS *.f90 *.c) +@@ -18,7 +21,7 @@ + file(READ ${solver-source} content) + string(FIND "${content}" "CHKERR" found) + if(NOT ${found} EQUAL -1) +- set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-160") ++ set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") + endif() + endforeach() + diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index 1f62e85761..29fc78a99a 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -15,6 +15,9 @@ class DamaskGrid(CMakePackage): maintainers = ["MarDiehl"] + version( + "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" + ) version( "3.0.0-alpha6", sha256="de6748c285558dec8f730c4301bfa56b4078c130ff80e3095faf76202f8d2109" ) @@ -25,15 +28,19 @@ class DamaskGrid(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") depends_on("petsc@3.14.0:3.14,3.15.1:3.15", when="@3.0.0-alpha4") depends_on("pkgconfig", type="build") depends_on("cmake@3.10:", type="build") depends_on("petsc+mpi+hdf5") + depends_on("hdf5@1.12:+mpi+fortran", when="@3.0.0-alpha7:") depends_on("hdf5@1.10:+mpi+fortran") depends_on("fftw+mpi") + depends_on("libfyaml", when="@3.0.0-alpha7:") + patch("long-lines.patch", when="@3.0.0-alpha7") patch("CMakeDebugRelease.patch", when="@3.0.0-alpha4") variant( @@ -44,7 +51,7 @@ class DamaskGrid(CMakePackage): ) def patch(self): - filter_file(" -lz ", " -lz ${FFTW_LIBS} ", "CMakeLists.txt") + filter_file(" -lz", " -lz ${FFTW_LIBS}", "CMakeLists.txt") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/damask-mesh/long-lines.patch b/var/spack/repos/builtin/packages/damask-mesh/long-lines.patch new file mode 100644 index 0000000000..b3e0f962ab --- /dev/null +++ b/var/spack/repos/builtin/packages/damask-mesh/long-lines.patch @@ -0,0 +1,21 @@ +--- damask.orig/src/CMakeLists.txt 2022-10-10 11:15:50.430977247 +0200 ++++ damask/src/CMakeLists.txt 2022-10-10 11:26:53.792092659 +0200 +@@ -2,6 +2,9 @@ + if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") + # long lines for interaction matrix + set_source_files_properties("lattice.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") ++ # CHKERRQ PETSc macro ++ set_source_files_properties("parallelization.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") ++ set_source_files_properties("quit.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") + endif() + + file(GLOB damask-sources CONFIGURE_DEPENDS *.f90 *.c) +@@ -18,7 +21,7 @@ + file(READ ${solver-source} content) + string(FIND "${content}" "CHKERR" found) + if(NOT ${found} EQUAL -1) +- set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-160") ++ set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") + endif() + endforeach() + diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 3507dfdff8..7e9590fcea 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -15,6 +15,9 @@ class DamaskMesh(CMakePackage): maintainers = ["MarDiehl"] + version( + "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" + ) version( "3.0.0-alpha6", sha256="de6748c285558dec8f730c4301bfa56b4078c130ff80e3095faf76202f8d2109" ) @@ -25,13 +28,16 @@ class DamaskMesh(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") depends_on("petsc@3.14.0:3.14,3.15.1:3.15", when="@3.0.0-alpha4") depends_on("pkgconfig", type="build") depends_on("cmake@3.10:", type="build") depends_on("petsc+mpi+hdf5") + depends_on("hdf5@1.12:+mpi+fortran", when="@3.0.0-alpha7:") depends_on("hdf5@1.10:+mpi+fortran") + depends_on("libfyaml", when="@3.0.0-alpha7:") patch("CMakeDebugRelease.patch", when="@3.0.0-alpha4") diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py index 849d7acd1a..953e82912a 100644 --- a/var/spack/repos/builtin/packages/damask/package.py +++ b/var/spack/repos/builtin/packages/damask/package.py @@ -28,10 +28,15 @@ class Damask(BundlePackage): maintainers = ["MarDiehl"] + version("3.0.0-alpha7") version("3.0.0-alpha6") version("3.0.0-alpha5") version("3.0.0-alpha4") + depends_on("damask-grid@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") + depends_on("damask-mesh@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") + depends_on("py-damask@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") + depends_on("damask-grid@3.0.0-alpha6", when="@3.0.0-alpha6", type="run") depends_on("damask-mesh@3.0.0-alpha6", when="@3.0.0-alpha6", type="run") depends_on("py-damask@3.0.0-alpha6", when="@3.0.0-alpha6", type="run") diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py index 659a3b3bc5..e7b44821bf 100644 --- a/var/spack/repos/builtin/packages/py-damask/package.py +++ b/var/spack/repos/builtin/packages/py-damask/package.py @@ -15,6 +15,9 @@ class PyDamask(PythonPackage): maintainers = ["MarDiehl"] + version( + "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" + ) version( "3.0.0-alpha6", sha256="de6748c285558dec8f730c4301bfa56b4078c130ff80e3095faf76202f8d2109" ) @@ -35,4 +38,6 @@ class PyDamask(PythonPackage): depends_on("py-matplotlib", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) + patch("setup.patch", when="@3.0.0-alpha7") + build_directory = "python" diff --git a/var/spack/repos/builtin/packages/py-damask/setup.patch b/var/spack/repos/builtin/packages/py-damask/setup.patch new file mode 100644 index 0000000000..e30bcefeef --- /dev/null +++ b/var/spack/repos/builtin/packages/py-damask/setup.patch @@ -0,0 +1,11 @@ +--- damask.orig/python/setup.cfg 2022-10-10 11:34:22.934631052 +0200 ++++ damask/python/setup.cfg 2022-10-10 11:54:32.197194977 +0200 +@@ -6,7 +6,7 @@ + url = https://damask.mpie.de + description = DAMASK processing tools + long_description = Pre- and post-processing tools for DAMASK +-license: AGPL3 ++license = AGPL3 + classifiers = + Intended Audience :: Science/Research + Topic :: Scientific/Engineering -- cgit v1.2.3-70-g09d2