zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[openfoam]: use latest cgal (#45003)

Browse Source 
* [openfoam]: use latest cgal
* add version checks for CGAL
This commit is contained in:
Robert Cohn 2024-07-03 17:04:38 -04:00 committed by GitHub
parent 8f2532c624
commit b4748de5a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
View File

@ -124,6 +124,7 @@ spack:
- netlib-scalapack - netlib-scalapack
- nrm - nrm
- omega-h - omega-h
- openfoam
- openmpi - openmpi
- papi - papi
- papyrus - papyrus
@ -189,7 +190,6 @@ spack:
# - glvis ^llvm # glvis: https://github.com/spack/spack/issues/42839 # - glvis ^llvm # glvis: https://github.com/spack/spack/issues/42839
# - hpctoolkit # dyninst@12.3.0%gcc: /usr/bin/ld: libiberty/./d-demangle.c:142: undefined reference to `_intel_fast_memcpy'; can't mix intel-tbb@%oneapi with dyninst%gcc # - hpctoolkit # dyninst@12.3.0%gcc: /usr/bin/ld: libiberty/./d-demangle.c:142: undefined reference to `_intel_fast_memcpy'; can't mix intel-tbb@%oneapi with dyninst%gcc
# - mgard +serial +openmp +timing +unstructured ~cuda # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] # - mgard +serial +openmp +timing +unstructured ~cuda # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing]
# - openfoam # cgal: https://github.com/spack/spack/issues/39481
# - openpmd-api # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] # - openpmd-api # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing]
# - pdt # pdt: pdbType.cc:193:21: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings] # - pdt # pdt: pdbType.cc:193:21: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings]
# - quantum-espresso # quantum-espresso@7.2 /i3fqdx5: warning: <unknown>:0:0: loop not unroll-and-jammed: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering # - quantum-espresso # quantum-espresso@7.2 /i3fqdx5: warning: <unknown>:0:0: loop not unroll-and-jammed: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering

8
var/spack/repos/builtin/packages/openfoam/package.py
View File

@ -369,8 +369,12 @@ class Openfoam(Package):
# See https://github.com/spack/spack/pull/22303 for reference # See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants) depends_on(Boost.with_default_variants)
# OpenFOAM does not play nice with CGAL 5.X # Earlier versions of OpenFOAM may not work with CGAL 5.6. I do
depends_on("cgal@:4") # not know which OpenFOAM added support for 5.x and conservatively
# use 2312 in the check.
depends_on("cgal", when="@2312:")
depends_on("cgal@:4", when="@:2306")
# The flex restriction is ONLY to deal with a spec resolution clash # The flex restriction is ONLY to deal with a spec resolution clash
# introduced by the restriction within scotch! # introduced by the restriction within scotch!
depends_on("flex@:2.6.1,2.6.4:") depends_on("flex@:2.6.1,2.6.4:")