Compare commits

...

4 Commits

Author SHA1 Message Date
eugeneswalker
a260bf038d boost: fix v1.78 build with oneapi (#30463) 2022-05-04 10:41:58 -07:00
Sergey Kosukhin
e0045a9daa cray platform: unload cray-mpich (#29898) 2022-04-12 08:50:20 -07:00
Tom Vander Aa
783615cacf intel-oneapi-mpi: set I_MPI_ROOT in setup_dependent_build_environment (#28890)
* setting I_MPI_ROOT is sometimes needed for find_package(MPI) in cmake to work
2022-02-15 08:23:04 -08:00
Thomas Madlener
a91621c6e1 fastjet add v3.3.4, fjcontrib add v1.045 (#22667) 2022-02-15 08:23:00 -08:00
6 changed files with 26 additions and 3 deletions

View File

@@ -821,12 +821,13 @@ def setup_package(pkg, dirty, context='build'):
for mod in pkg.compiler.modules:
load_module(mod)
# kludge to handle cray libsci being automatically loaded by PrgEnv
# modules on cray platform. Module unload does no damage when
# kludge to handle cray mpich and libsci being automatically loaded by
# PrgEnv modules on cray platform. Module unload does no damage when
# unnecessary
on_cray, _ = _on_cray()
if on_cray:
module('unload', 'cray-libsci')
for mod in ['cray-mpich', 'cray-libsci']:
module('unload', mod)
if target.module_name:
load_module(target.module_name)

View File

@@ -0,0 +1,11 @@
--- a/tools/build/src/tools/intel-linux.jam 2021-12-01 22:47:38.000000000 -0800
+++ b/tools/build/src/tools/intel-linux.jam 2022-05-03 13:40:41.569430070 -0700
@@ -276,7 +276,7 @@
#
actions compile.c++.pch
{
- rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
+ rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -Xclang -emit-pch -o "$(<)" "$(>)"
}
actions compile.fortran

View File

@@ -314,6 +314,9 @@ def libs(self):
# See https://github.com/spack/spack/issues/28273
patch("pthread-stack-min-fix.patch", when="@1.69.0:1.72.0")
# https://www.intel.com/content/www/us/en/developer/articles/technical/building-boost-with-oneapi.html
patch("1.78-intel-linux-jam.patch", when="@1.78 %oneapi")
def patch(self):
# Disable SSSE3 and AVX2 when using the NVIDIA compiler
if self.spec.satisfies('%nvhpc'):
@@ -327,6 +330,10 @@ def patch(self):
filter_file('-fast', '-O1', 'tools/build/src/tools/pgi.jam')
filter_file('-fast', '-O1', 'tools/build/src/engine/build.sh')
# Fixes https://github.com/spack/spack/issues/29352
if self.spec.satisfies('@1.78 %intel') or self.spec.satisfies('@1.78 %oneapi'):
filter_file('-static', '', 'tools/build/src/engine/build.sh')
def url_for_version(self, version):
if version >= Version('1.63.0'):
url = "https://boostorg.jfrog.io/artifactory/main/release/{0}/source/boost_{1}.tar.bz2"

View File

@@ -19,6 +19,7 @@ class Fastjet(AutotoolsPackage):
maintainers = ['drbenmorgan', 'vvolkl']
version('3.3.4', sha256='432b51401e1335697c9248519ce3737809808fc1f6d1644bfae948716dddfc03')
version('3.3.3', sha256='30b0a0282ce5aeac9e45862314f5966f0be941ce118a83ee4805d39b827d732b')
version('3.3.2', sha256='3f59af13bfc54182c6bb0b0a6a8541b409c6fda5d105f17e03c4cce8db9963c2')
version('3.3.1', sha256='76bfed9b87e5efdb93bcd0f7779e27427fbe38e05fe908c2a2e80a9ca0876c53')

View File

@@ -16,6 +16,7 @@ class Fjcontrib(AutotoolsPackage):
tags = ['hep']
version('1.045', sha256='667f15556ca371cfaf185086fb41ac579658a233c18fb1e5153382114f9785f8')
version('1.044', sha256='de3f45c2c1bed6d7567483e4a774575a504de8ddc214678bac7f64e9d2e7e7a7')
version('1.043', sha256='ef0f586b19ffd12f392b7facc890a73d31fc11b9f5bb727cf3743d6eb59e9993')
version('1.042', sha256='5b052e93a371c557557fa4a293cca4b08f88ccfb6c43a4df15b2a9f38c6d8831')

View File

@@ -75,6 +75,8 @@ def setup_dependent_build_environment(self, env, dependent_spec):
env.set('MPIF90', join_path(dir, 'mpif90'))
env.set('MPIFC', join_path(dir, 'mpifc'))
env.set('I_MPI_ROOT', self.component_path)
@property
def headers(self):
include_path = join_path(self.component_path, 'include')