Fix link issue for 2021a, C++ standard issue for 2021b

easybuilders · Jul 25, 2022 · 920d48e · 920d48e
1 parent 494fc0e
commit 920d48e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/easybuild/easyconfigs/l/LAMMPS/LAMMPS-23Jun2022-foss-2021a-kokkos-CUDA-11.3.1.eb b/easybuild/easyconfigs/l/LAMMPS/LAMMPS-23Jun2022-foss-2021a-kokkos-CUDA-11.3.1.eb
@@ -45,7 +45,7 @@ dependencies = [
     ('gzip', '1.10'),
     ('cURL', '7.76.0'),
     ('HDF5', '1.10.7'),
-    ('tbb', '2020.3'),
+    # ('tbb', '2020.3'),  # Optionally required by Intel package but has a link problem when using nvlink
     ('PCRE', '8.44'),
     ('libxml2', '2.9.10'),
     ('FFmpeg', '4.3.2'),

diff --git a/easybuild/easyconfigs/l/LAMMPS/LAMMPS-23Jun2022-foss-2021b-kokkos-CUDA-11.4.1.eb b/easybuild/easyconfigs/l/LAMMPS/LAMMPS-23Jun2022-foss-2021b-kokkos-CUDA-11.4.1.eb
@@ -64,11 +64,12 @@ dependencies = [
 # which is claimed to be faster in pure MPI calculations
 # configopts  = "-DKokkos_ENABLE_SERIAL=yes "
 
-
 # packages auto-enabled by easyblock
 # 'GPU'    - if cuda package is present and kokkos is disabled
 # 'KOKKOS' - if kokkos is enabled (by default)
 
+# GCC 11/12 defaults to C++17 standard, need to be consistent
+configopts  = "-DKokkos_CXX_STANDARD=17 "
 
 # include the following extra packages into the build
 general_packages = [