Skip to content

Commit e793cee

Browse files
nychiangnychiang
authored
use latest raja and umpire (#706)
1 parent d235c7e commit e793cee

File tree

9 files changed

+160
-100
lines changed

9 files changed

+160
-100
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ if(HIOP_USE_GPU)
242242
enable_language(CUDA)
243243
check_language(CUDA)
244244

245+
set(CMAKE_CUDA_HOST_COMPILER g++)
246+
245247
if(NOT DEFINED CMAKE_CUDA_STANDARD)
246248
set(CMAKE_CUDA_STANDARD 17)
247249
set(CMAKE_CUDA_STANDARD_REQUIRED ON)

‎scripts/lassenVariables.sh‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
module use -a /usr/workspace/hiop/software/spack_modules_202408/linux-rhel7-power9le
1+
module use -a /usr/workspace/hiop/software/spack_modules_202501/linux-rhel7-power9le
22

33
module purge
44

5-
module load gcc/8.3.1
6-
module load cmake/3.20.2
5+
module load gcc/11.2.1
6+
module load cmake/3.23.1
77
module load python/3.8.2
88

9+
# cmake@=3.23.1%gcc@=11.2.1~doc+ncurses+ownlibs build_system=generic build_type=Release patches=dbc3892 arch=linux-rhel7-power9le
10+
module load cmake/3.23.1-linux-rhel7-power9le-wkkrdll
11+
# glibc@=2.17%gcc@=11.2.1 build_system=autotools patches=be65fec,e179c43 arch=linux-rhel7-power9le
12+
module load glibc/2.17-linux-rhel7-power9le-7k6zu4s
13+
# gcc-runtime@=11.2.1%gcc@=11.2.1 build_system=generic arch=linux-rhel7-power9le
14+
module load gcc-runtime/11.2.1-linux-rhel7-power9le-ze6g3xs
15+
# blt@=0.6.2%gcc@=11.2.1 build_system=generic arch=linux-rhel7-power9le
16+
module load blt/0.6.2-linux-rhel7-power9le-gkzs3dj
17+
# cuda@=11.7.0%gcc@=11.2.1~allow-unsupported-compilers~dev build_system=generic arch=linux-rhel7-power9le
18+
module load cuda/11.7.0-linux-rhel7-power9le-5d4j5ta
19+
# gmake@=4.4.1%gcc@=11.2.1~guile build_system=generic arch=linux-rhel7-power9le
20+
module load gmake/4.4.1-linux-rhel7-power9le-22mrdsf
21+
# camp@=2024.07.0%gcc@=11.2.1+cuda~ipo~omptarget~openmp~rocm~sycl~tests build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
22+
module load camp/2024.07.0-linux-rhel7-power9le-pb3ih64
23+
# gnuconfig@=2022-09-17%gcc@=11.2.1 build_system=generic arch=linux-rhel7-power9le
24+
module load gnuconfig/2022-09-17-linux-rhel7-power9le-qf2eum2
25+
# berkeley-db@=18.1.40%gcc@=11.2.1+cxx~docs+stl build_system=autotools patches=26090f4,b231fcc arch=linux-rhel7-power9le
26+
module load berkeley-db/18.1.40-linux-rhel7-power9le-4z72abi
27+
# libiconv@=1.17%gcc@=11.2.1 build_system=autotools libs=shared,static arch=linux-rhel7-power9le
28+
module load libiconv/1.17-linux-rhel7-power9le-mty7cry
29+
# diffutils@=3.10%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
30+
module load diffutils/3.10-linux-rhel7-power9le-65n77vt
31+
# bzip2@=1.0.8%gcc@=11.2.1~debug~pic+shared build_system=generic arch=linux-rhel7-power9le
32+
module load bzip2/1.0.8-linux-rhel7-power9le-jshnslw
33+
# pkgconf@=2.2.0%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
34+
module load pkgconf/2.2.0-linux-rhel7-power9le-e47l3cy
35+
# ncurses@=6.5%gcc@=11.2.1~symlinks+termlib abi=none build_system=autotools patches=7a351bc arch=linux-rhel7-power9le
36+
module load ncurses/6.5-linux-rhel7-power9le-seblzpm
37+
# readline@=8.2%gcc@=11.2.1 build_system=autotools patches=bbf97f1 arch=linux-rhel7-power9le
38+
module load readline/8.2-linux-rhel7-power9le-5jt6gwi
39+
# gdbm@=1.23%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
40+
module load gdbm/1.23-linux-rhel7-power9le-wqcrnp7
41+
# zlib-ng@=2.2.1%gcc@=11.2.1+compat+new_strategies+opt+pic+shared build_system=autotools arch=linux-rhel7-power9le
42+
module load zlib-ng/2.2.1-linux-rhel7-power9le-dtbpo6f
43+
# perl@=5.40.0%gcc@=11.2.1+cpanm+opcode+open+shared+threads build_system=generic arch=linux-rhel7-power9le
44+
module load perl/5.40.0-linux-rhel7-power9le-dm5nz4g
45+
# openblas@=0.3.27%gcc@=11.2.1~bignuma~consistent_fpcsr+dynamic_dispatch+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-rhel7-power9le
46+
module load openblas/0.3.27-linux-rhel7-power9le-nuroloa
47+
# coinhsl@=2015.06.23%gcc@=11.2.1+blas build_system=autotools arch=linux-rhel7-power9le
48+
module load coinhsl/2015.06.23-linux-rhel7-power9le-ddp4zv4
49+
# magma@=2.8.0%gcc@=11.2.1+cuda+fortran~ipo~rocm+shared build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
50+
module load magma/2.8.0-linux-rhel7-power9le-hckttgy
51+
# metis@=5.1.0%gcc@=11.2.1~gdb~int64~ipo~real64+shared build_system=cmake build_type=Release generator=make patches=4991da9,93a7903,b1225da arch=linux-rhel7-power9le
52+
module load metis/5.1.0-linux-rhel7-power9le-bciofvn
53+
# raja@=2024.07.0%gcc@=11.2.1+cuda~desul+examples+exercises~ipo~omptarget~omptask~openmp~plugins~rocm~run-all-tests~shared~sycl~tests~vectorization build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
54+
module load raja/2024.07.0-linux-rhel7-power9le-23xik32
55+
# spectrum-mpi@=rolling-release%gcc@=11.2.1 build_system=bundle arch=linux-rhel7-power9le
56+
module load spectrum-mpi/rolling-release-linux-rhel7-power9le-4oma342
57+
# libsigsegv@=2.14%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
58+
module load libsigsegv/2.14-linux-rhel7-power9le-4ctxf7z
59+
# m4@=1.4.19%gcc@=11.2.1+sigsegv build_system=autotools patches=9dc5fbd,bfdffa7 arch=linux-rhel7-power9le
60+
module load m4/1.4.19-linux-rhel7-power9le-7gxob2i
61+
# autoconf@=2.72%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
62+
module load autoconf/2.72-linux-rhel7-power9le-ndavzxt
63+
# automake@=1.16.5%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
64+
module load automake/1.16.5-linux-rhel7-power9le-ohdcq5s
65+
# findutils@=4.9.0%gcc@=11.2.1 build_system=autotools patches=440b954 arch=linux-rhel7-power9le
66+
module load findutils/4.9.0-linux-rhel7-power9le-fjcddvv
67+
# libtool@=2.4.7%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
68+
module load libtool/2.4.7-linux-rhel7-power9le-pkgmuev
69+
# gmp@=6.3.0%gcc@=11.2.1+cxx build_system=autotools libs=shared,static arch=linux-rhel7-power9le
70+
module load gmp/6.3.0-linux-rhel7-power9le-bwq4h26
71+
# autoconf-archive@=2023.02.20%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
72+
module load autoconf-archive/2023.02.20-linux-rhel7-power9le-xf2e7ia
73+
# xz@=5.4.6%gcc@=11.2.1~pic build_system=autotools libs=shared,static arch=linux-rhel7-power9le
74+
module load xz/5.4.6-linux-rhel7-power9le-t7fe3d7
75+
# libxml2@=2.10.3%gcc@=11.2.1+pic~python+shared build_system=autotools arch=linux-rhel7-power9le
76+
module load libxml2/2.10.3-linux-rhel7-power9le-tejjnjc
77+
# pigz@=2.8%gcc@=11.2.1 build_system=makefile arch=linux-rhel7-power9le
78+
module load pigz/2.8-linux-rhel7-power9le-7ziaqa5
79+
# zstd@=1.5.6%gcc@=11.2.1+programs build_system=makefile compression=none libs=shared,static arch=linux-rhel7-power9le
80+
module load zstd/1.5.6-linux-rhel7-power9le-j5eflwe
81+
# tar@=1.34%gcc@=11.2.1 build_system=autotools zip=pigz arch=linux-rhel7-power9le
82+
module load tar/1.34-linux-rhel7-power9le-rs7th2v
83+
# gettext@=0.22.5%gcc@=11.2.1+bzip2+curses+git~libunistring+libxml2+pic+shared+tar+xz build_system=autotools arch=linux-rhel7-power9le
84+
module load gettext/0.22.5-linux-rhel7-power9le-vjrjusm
85+
# texinfo@=7.1%gcc@=11.2.1 build_system=autotools arch=linux-rhel7-power9le
86+
module load texinfo/7.1-linux-rhel7-power9le-wciytfy
87+
# mpfr@=4.2.1%gcc@=11.2.1 build_system=autotools libs=shared,static arch=linux-rhel7-power9le
88+
module load mpfr/4.2.1-linux-rhel7-power9le-kgbrykj
89+
# suite-sparse@=7.7.0%gcc@=11.2.1~cuda~graphblas~openmp+pic build_system=generic arch=linux-rhel7-power9le
90+
module load suite-sparse/7.7.0-linux-rhel7-power9le-lt7472e
91+
# fmt@=11.0.2%gcc@=11.2.1~ipo+pic~shared build_system=cmake build_type=Release cxxstd=11 generator=make arch=linux-rhel7-power9le
92+
module load fmt/11.0.2-linux-rhel7-power9le-db6c3b6
93+
# umpire@=2024.07.0%gcc@=11.2.1~asan~backtrace+c+cuda~dev_benchmarks~device_alloc~deviceconst~examples+fmt_header_only~fortran~ipc_shmem~ipo~mpi~numa~omptarget~openmp~rocm~sanitizer_tests~shared~sqlite_experimental~tools~werror build_system=cmake build_type=Release cuda_arch=70 generator=make tests=none arch=linux-rhel7-power9le
94+
module load umpire/2024.07.0-linux-rhel7-power9le-ozkmp3f
95+
# hiop@=develop%gcc@=11.2.1+cuda+cusolver_lu+deepchecking~ginkgo~ipo~jsrun+kron+mpi+raja~rocm~shared+sparse build_system=cmake build_type=Release cuda_arch=70 dev_path=/usr/workspace/hiop/lassen/hiop_from_spack generator=make arch=linux-rhel7-power9le
96+
#module load hiop/develop-linux-rhel7-power9le-5yc5imr
997

10-
# cmake@=3.20.2%gcc@=8.3.1~doc+ncurses+ownlibs build_system=generic build_type=Release arch=linux-rhel7-power9le
11-
module load cmake/3.20.2-linux-rhel7-power9le-sgbbk2e
12-
# glibc@=2.17%gcc@=8.3.1 build_system=autotools patches=be65fec,e179c43 arch=linux-rhel7-power9le
13-
module load glibc/2.17-linux-rhel7-power9le-ltqhcqm
14-
# gcc-runtime@=8.3.1%gcc@=8.3.1 build_system=generic arch=linux-rhel7-power9le
15-
module load gcc-runtime/8.3.1-linux-rhel7-power9le-hvpgryd
16-
# blt@=0.4.1%gcc@=8.3.1 build_system=generic arch=linux-rhel7-power9le
17-
module load blt/0.4.1-linux-rhel7-power9le-yq3ifkk
18-
# cub@=1.16.0%gcc@=8.3.1 build_system=generic arch=linux-rhel7-power9le
19-
module load cub/1.16.0-linux-rhel7-power9le-mbi6tgn
20-
# gmake@=4.4.1%gcc@=8.3.1~guile build_system=generic arch=linux-rhel7-power9le
21-
module load gmake/4.4.1-linux-rhel7-power9le-76tj7qq
22-
# gnuconfig@=2022-09-17%gcc@=8.3.1 build_system=generic arch=linux-rhel7-power9le
23-
module load gnuconfig/2022-09-17-linux-rhel7-power9le-33h26h4
24-
# libiconv@=1.17%gcc@=8.3.1 build_system=autotools libs=shared,static arch=linux-rhel7-power9le
25-
module load libiconv/1.17-linux-rhel7-power9le-vomriir
26-
# pkgconf@=2.2.0%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
27-
module load pkgconf/2.2.0-linux-rhel7-power9le-w5eyts5
28-
# xz@=5.4.6%gcc@=8.3.1~pic build_system=autotools libs=shared,static arch=linux-rhel7-power9le
29-
module load xz/5.4.6-linux-rhel7-power9le-wy2yvqt
30-
# zlib-ng@=2.2.1%gcc@=8.3.1+compat+new_strategies+opt+pic+shared build_system=autotools arch=linux-rhel7-power9le
31-
module load zlib-ng/2.2.1-linux-rhel7-power9le-zfirv2c
32-
# libxml2@=2.10.3%gcc@=8.3.1+pic~python+shared build_system=autotools arch=linux-rhel7-power9le
33-
module load libxml2/2.10.3-linux-rhel7-power9le-a2cuzya
34-
# cuda@=11.4.2%gcc@=8.3.1~allow-unsupported-compilers~dev build_system=generic arch=linux-rhel7-power9le
35-
module load cuda/11.4.2-linux-rhel7-power9le-rpeosz6
36-
# camp@=0.2.3%gcc@=8.3.1+cuda~ipo+openmp~rocm~tests build_system=cmake build_type=Release cuda_arch=70 generator=make patches=cb9e25b arch=linux-rhel7-power9le
37-
module load camp/0.2.3-linux-rhel7-power9le-seoxg6w
38-
# berkeley-db@=18.1.40%gcc@=8.3.1+cxx~docs+stl build_system=autotools patches=26090f4,b231fcc arch=linux-rhel7-power9le
39-
module load berkeley-db/18.1.40-linux-rhel7-power9le-xeq7mjg
40-
# diffutils@=3.10%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
41-
module load diffutils/3.10-linux-rhel7-power9le-gg26vck
42-
# bzip2@=1.0.8%gcc@=8.3.1~debug~pic+shared build_system=generic arch=linux-rhel7-power9le
43-
module load bzip2/1.0.8-linux-rhel7-power9le-kzyaip2
44-
# ncurses@=6.5%gcc@=8.3.1~symlinks+termlib abi=none build_system=autotools patches=7a351bc arch=linux-rhel7-power9le
45-
module load ncurses/6.5-linux-rhel7-power9le-h3en26s
46-
# readline@=8.2%gcc@=8.3.1 build_system=autotools patches=bbf97f1 arch=linux-rhel7-power9le
47-
module load readline/8.2-linux-rhel7-power9le-dhcjafy
48-
# gdbm@=1.23%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
49-
module load gdbm/1.23-linux-rhel7-power9le-eizs5lo
50-
# perl@=5.40.0%gcc@=8.3.1+cpanm+opcode+open+shared+threads build_system=generic arch=linux-rhel7-power9le
51-
module load perl/5.40.0-linux-rhel7-power9le-cmrz6t7
52-
# openblas@=0.3.24%gcc@=8.3.1~bignuma~consistent_fpcsr+dynamic_dispatch+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-rhel7-power9le
53-
module load openblas/0.3.24-linux-rhel7-power9le-6ek5q6o
54-
# coinhsl@=2015.06.23%gcc@=8.3.1+blas build_system=autotools arch=linux-rhel7-power9le
55-
module load coinhsl/2015.06.23-linux-rhel7-power9le-7usp2us
56-
# ginkgo@=1.5.0.glu_experimental%gcc@=8.3.1+cuda~develtools~full_optimizations~hwloc~ipo~mpi+openmp~rocm+shared~sycl build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
57-
module load ginkgo/1.5.0.glu_experimental-linux-rhel7-power9le-ibgwveo
58-
# magma@=2.6.2%gcc@=8.3.1+cuda+fortran~ipo~rocm+shared build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
59-
module load magma/2.6.2-linux-rhel7-power9le-qdoblh3
60-
# metis@=5.1.0%gcc@=8.3.1~gdb~int64~ipo~real64+shared build_system=cmake build_type=Release generator=make patches=4991da9,93a7903,b1225da arch=linux-rhel7-power9le
61-
module load metis/5.1.0-linux-rhel7-power9le-pq37727
62-
# raja@=0.14.0%gcc@=8.3.1+cuda~desul~examples~exercises~ipo~omptask+openmp~plugins~rocm~run-all-tests+shared~tests~vectorization build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-rhel7-power9le
63-
module load raja/0.14.0-linux-rhel7-power9le-i3do7mn
64-
# spectrum-mpi@=rolling-release%gcc@=8.3.1 build_system=bundle arch=linux-rhel7-power9le
65-
module load spectrum-mpi/rolling-release-linux-rhel7-power9le-cycs4kt
66-
# libsigsegv@=2.14%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
67-
module load libsigsegv/2.14-linux-rhel7-power9le-fl37xzk
68-
# m4@=1.4.19%gcc@=8.3.1+sigsegv build_system=autotools patches=9dc5fbd,bfdffa7 arch=linux-rhel7-power9le
69-
module load m4/1.4.19-linux-rhel7-power9le-gwetdjs
70-
# autoconf@=2.72%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
71-
module load autoconf/2.72-linux-rhel7-power9le-nr3otal
72-
# automake@=1.16.5%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
73-
module load automake/1.16.5-linux-rhel7-power9le-4tpk52n
74-
# findutils@=4.9.0%gcc@=8.3.1 build_system=autotools patches=440b954 arch=linux-rhel7-power9le
75-
module load findutils/4.9.0-linux-rhel7-power9le-7lhqpqk
76-
# libtool@=2.4.7%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
77-
module load libtool/2.4.7-linux-rhel7-power9le-fo55ddx
78-
# gmp@=6.3.0%gcc@=8.3.1+cxx build_system=autotools libs=shared,static arch=linux-rhel7-power9le
79-
module load gmp/6.3.0-linux-rhel7-power9le-wtffv4t
80-
# autoconf-archive@=2023.02.20%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
81-
module load autoconf-archive/2023.02.20-linux-rhel7-power9le-nlgst5g
82-
# pigz@=2.8%gcc@=8.3.1 build_system=makefile arch=linux-rhel7-power9le
83-
module load pigz/2.8-linux-rhel7-power9le-du7lszg
84-
# zstd@=1.5.6%gcc@=8.3.1+programs build_system=makefile compression=none libs=shared,static arch=linux-rhel7-power9le
85-
module load zstd/1.5.6-linux-rhel7-power9le-rlza3tv
86-
# tar@=1.34%gcc@=8.3.1 build_system=autotools zip=pigz arch=linux-rhel7-power9le
87-
module load tar/1.34-linux-rhel7-power9le-66m3wvh
88-
# gettext@=0.22.5%gcc@=8.3.1+bzip2+curses+git~libunistring+libxml2+pic+shared+tar+xz build_system=autotools arch=linux-rhel7-power9le
89-
module load gettext/0.22.5-linux-rhel7-power9le-je7e7cy
90-
# texinfo@=7.1%gcc@=8.3.1 build_system=autotools arch=linux-rhel7-power9le
91-
module load texinfo/7.1-linux-rhel7-power9le-oss2b3r
92-
# mpfr@=4.2.1%gcc@=8.3.1 build_system=autotools libs=shared,static arch=linux-rhel7-power9le
93-
module load mpfr/4.2.1-linux-rhel7-power9le-tqg7cbt
94-
# suite-sparse@=5.13.0%gcc@=8.3.1~cuda~graphblas~openmp+pic build_system=generic arch=linux-rhel7-power9le
95-
module load suite-sparse/5.13.0-linux-rhel7-power9le-nhqdwpc
96-
# umpire@=6.0.0%gcc@=8.3.1~asan~backtrace~c+cuda~dev_benchmarks~device_alloc~deviceconst~examples~fortran~ipc_shmem~ipo~mpi~numa~openmp~openmp_target~rocm~sanitizer_tests~shared~sqlite_experimental~tools~werror build_system=cmake build_type=Release cuda_arch=70 generator=make tests=none arch=linux-rhel7-power9le
97-
module load umpire/6.0.0-linux-rhel7-power9le-qndtsb2
9898

9999
[ -f $PWD/nvblas.conf ] && rm $PWD/nvblas.conf
100100
cat > $PWD/nvblas.conf <<-EOD

‎scripts/platforms/lassen/spack.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
spack:
2+
specs:
3+
- hiop@develop+kron+mpi+raja+sparse+cuda+cusolver_lu cuda_arch=70
4+
- raja@2024.07.0
5+
- umpire@2024.07.0
6+
- coinhsl@2015.06.23
7+
8+
view: false
9+
concretizer:
10+
unify: true
11+
reuse: false
12+
packages:
13+
all:
14+
providers:
15+
mpi: [spectrum-mpi]
16+
blas: [openblas]
17+
lapack: [openblas]
18+
spectrum-mpi:
19+
externals:
20+
- spec: spectrum-mpi@rolling-release
21+
modules: [spectrum-mpi/rolling-release]
22+
buildable: false
23+
coinnhsl:
24+
variants: +blas+metis
25+
python:
26+
externals:
27+
- spec: python@3.8.2
28+
modules: [python/3.8.2]
29+
buildable: false
30+
cuda:
31+
externals:
32+
- spec: cuda@11.7.0
33+
modules:
34+
- cuda/11.7.0
35+
buildable: false
36+
cmake:
37+
externals:
38+
- spec: cmake@3.23.1
39+
modules: [cmake/3.23.1]
40+
buildable: false
41+
compilers:
42+
- compiler:
43+
spec: gcc@11.2.1
44+
paths:
45+
cc: /usr/tce/packages/gcc/gcc-11.2.1/bin/cc
46+
cxx: /usr/tce/packages/gcc/gcc-11.2.1/bin/g++
47+
f77: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
48+
fc: /usr/tce/packages/gcc/gcc-11.2.1/bin/gfortran
49+
flags: {}
50+
operating_system: rhel7
51+
target: ppc64le
52+
modules: []
53+
environment: {}
54+
extra_rpaths: []
55+
develop:
56+
hiop:
57+
path: /usr/workspace/hiop/lassen/hiop_from_spack
58+
spec: hiop@develop

‎scripts/platforms/marianas/spack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
spack:
22
specs:
3-
- hiop%gcc@10.2.0@develop+cuda+deepchecking+sparse+kron+cusolver+ginkgo+raja cuda_arch=60
3+
- hiop%gcc@10.2.0@develop+cuda+deepchecking+sparse+kron+cusolver_lu+ginkgo+raja cuda_arch=60
44
- raja@0.14.0
55
- umpire@6.0.0
66
- coinhsl@2019.05.21

‎scripts/platforms/newell/spack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
spack:
22
specs:
3-
- hiop@develop+kron+mpi+raja+sparse+cuda+ginkgo+deepchecking+cusolver cuda_arch=70
3+
- hiop@develop+kron+mpi+raja+sparse+cuda+ginkgo+deepchecking+cusolver_lu cuda_arch=70
44
- raja@0.14.0
55
- umpire@6.0.0
66
- coinhsl@2019.05.21

‎src/Drivers/MDS/NlpMdsRajaEx1.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ bool MdsEx1::get_vars_info(const size_type& n, double* xlow, double* xupp, Nonli
240240
});
241241

242242
// Use a sequential policy for host computations for now
243-
RAJA::forall<RAJA::loop_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
243+
RAJA::forall<RAJA::seq_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
244244
return true;
245245
}
246246

@@ -277,7 +277,7 @@ bool MdsEx1::get_cons_info(const size_type& m, double* clow, double* cupp, Nonli
277277
});
278278

279279
// Must be a sequential host policy for now
280-
RAJA::forall<RAJA::loop_exec>(RAJA::RangeSegment(0, m), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
280+
RAJA::forall<RAJA::seq_exec>(RAJA::RangeSegment(0, m), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
281281
return true;
282282
}
283283

‎src/Drivers/PriDec/NlpPriDecEx2UserRecourseSparseRaja.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class PriDecRecourseProbleEx2Sparse : public hiop::hiopInterfaceSparse
211211
}
212212
});
213213

214-
RAJA::forall<RAJA::loop_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
214+
RAJA::forall<RAJA::seq_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
215215
return true;
216216
}
217217

‎src/Drivers/Sparse/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ add_executable(NlpSparseEx4.exe NlpSparseEx4.cpp NlpSparseEx4Driver.cpp)
1818
target_link_libraries(NlpSparseEx4.exe HiOp::HiOp)
1919

2020
if(HIOP_USE_RAJA)
21-
if(HIOP_USE_GPU AND HIOP_USE_CUDA)
21+
if(HIOP_USE_GPU AND HIOP_USE_CUDA AND HIOP_USE_RESOLVE)
2222
set_source_files_properties(
2323
NlpSparseRajaEx2.cpp
2424
NlpSparseRajaEx2Driver.cpp
@@ -83,7 +83,7 @@ if(HIOP_USE_GINKGO)
8383
endif(HIOP_USE_HIP)
8484
endif(HIOP_USE_GINKGO)
8585

86-
if(HIOP_USE_RAJA AND HIOP_USE_GPU AND HIOP_USE_CUDA)
86+
if(HIOP_USE_RAJA AND HIOP_USE_GPU AND HIOP_USE_CUDA AND HIOP_USE_RESOLVE)
8787
add_test(NAME NlpSparseRaja2_1 COMMAND ${RUNCMD} "$<TARGET_FILE:NlpSparseRajaEx2.exe>" "500" "-inertiafree" "-selfcheck" "-resolve_cuda_glu")
8888
add_test(NAME NlpSparseRaja2_2 COMMAND ${RUNCMD} "$<TARGET_FILE:NlpSparseRajaEx2.exe>" "500" "-inertiafree" "-selfcheck" "-resolve_cuda_rf")
8989
endif()

‎src/Drivers/Sparse/NlpSparseRajaEx2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ bool SparseRajaEx2::get_vars_info(const size_type& n, double* xlow, double* xupp
174174
}
175175

176176
// Use a sequential policy for host computations for now
177-
RAJA::forall<RAJA::loop_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
177+
RAJA::forall<RAJA::seq_exec>(RAJA::RangeSegment(0, n), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
178178

179179
return true;
180180
}
@@ -226,7 +226,7 @@ bool SparseRajaEx2::get_cons_info(const size_type& m, double* clow, double* cupp
226226
}
227227

228228
// Must be a sequential host policy for now
229-
RAJA::forall<RAJA::loop_exec>(RAJA::RangeSegment(0, m), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
229+
RAJA::forall<RAJA::seq_exec>(RAJA::RangeSegment(0, m), [=](RAJA::Index_type i) { type[i] = hiopNonlinear; });
230230

231231
return true;
232232
}

0 commit comments

Comments
 (0)