hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

axom@0.6.1 %oneapi: patch examples (#31991)

Browse source 
* axom@0.6.1 %oneapi: patch examples

* uncomment axom%oneapi ci build now that it is fixed
This commit is contained in:
eugeneswalker 2022-08-08 12:39:32 -07:00 committed by GitHub
parent 522fda0a48
commit 9215d59599
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
View file

@ -100,6 +100,7 @@ spack:
- amrex
- arborx
- argobots
- axom
- bolt
- bricks
- butterflypack
@ -190,7 +191,6 @@ spack:
#- adios2@2.8.0 # adios2
#- archer@2.0.0 # binutils
#- ascent ^vtk-m ~openmp # ascent
#- axom@0.6.1 # axom
#- charliecloud@0.26 # charliecloud
#- dyninst@12.1.0 # intel-tbb
#- exaworks@0.1.0 # rust, flux-sched
@ -216,7 +216,6 @@ spack:
# CPU BUILD FAILURES - NOTES
# adios2: /usr/bin/ld: ../../lib/libadios2_fortran.so.2.8.2: version node not found for symbol adios2_adios_init_mod@adios2_adios_init_serial_smod._; /usr/bin/ld: failed to set dynamic section sizes: bad value
# ascent: examples/proxies/cloverleaf3d-ref/clover_main.cpp:24: multiple definition of `main'; /opt/intel/oneapi/compiler/2022.1.0/linux/compiler/lib/intel64_lin/for_main.o:for_main.c:(.text+0x0): first defined here
# axom: /usr/bin/ld: /lib/x86_64-linux-gnu/crt1.o: in function `_start': (.text+0x24): undefined reference to `main'
# binutils: gold/powerpc.cc:3590: undefined reference to `gold::Sized_symbol<64>::Value_type gold::Symbol_table::compute_final_value<64>(gold::Sized_symbol<64> const*, gold::Symbol_table::Compute_final_value_status*) const'
# boost@1.79.0 cxxstd=17: clang++: error: unsupported argument 'h-create' to option '-pc'; clang++: error: no such file or directory: 'bin.v2/libs/math/build/intel-linux-2022.1.0/release/cxxstd-17-iso/threading-multi/visibility-hidden/pch.pchi'
# charliecloud: autoreconf phase: RuntimeError: configure script not found in ...

12
var/spack/repos/builtin/packages/axom/examples-oneapi.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ruN spack-src/src/axom/quest/examples/CMakeLists.txt spack-src-patched/src/axom/quest/examples/CMakeLists.txt
--- spack-src/src/axom/quest/examples/CMakeLists.txt 2022-08-08 08:51:26.746637415 -0700
+++ spack-src-patched/src/axom/quest/examples/CMakeLists.txt 2022-08-08 08:52:26.238959054 -0700
@@ -103,7 +103,7 @@
# When CUDA is enabled, BLT will determine the correct linker, so don't override it here
if (NOT ENABLE_CUDA)
# When using the Intel compiler we need to link with the Fortran compiler to get openmp to work correctly.
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM")
set_target_properties( quest_signed_distance_interface_F_ex
PROPERTIES LINKER_LANGUAGE Fortran)

3
var/spack/repos/builtin/packages/axom/package.py
View file

@ -54,6 +54,9 @@ class Axom(CachedCMakePackage, CudaPackage):
def submodules(self):
return True
# https://github.com/spack/spack/issues/31829
patch("examples-oneapi.patch", when="@0.6.1 +examples %oneapi")
patch("scr_examples_gtest.patch", when="@0.6.0:0.6.1")
root_cmakelists_dir = "src"