Skip to content

change cuda arch for streak2 #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
castelletto1 merged 3 commits into from
Feb 25, 2026
Merged

change cuda arch for streak2 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ce1596
change cuda arch for streak2
rrsettgast Feb 24, 2026
4270d56
fix bad merge
rrsettgast Feb 24, 2026
4f0f835
revert some changes
rrsettgast Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_tpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
# TPL_DOCKERFILE: docker/Stanford/Dockerfile
# DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1
# SPEC: "~pygeosx~openmp cuda_arch=70 %gcc@10.1.0 ^cuda@12.4.0+allow-unsupported-compilers"
# SPEC: "~pygeosx~openmp cuda_arch=86 %gcc@10.1.0 ^cuda@12.4.0+allow-unsupported-compilers"
# INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
# RUNS_ON: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion docker/tpl-centos-gcc-cuda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
# Create symlink to openmpi include directory
ln -s /usr/include/openmpi-x86_64 /usr/lib64/openmpi/include && \
./scripts/uberenv/uberenv.py \
--spec "%gcc@8+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spec "%gcc@8+cuda~uncrustify~openmp~pygeosx cuda_arch=86 ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spack-env-file=${SRC_DIR}/docker/spack.yaml \
--project-json=.uberenv_config.json \
--prefix ${GEOSX_TPL_DIR} \
Expand Down
2 changes: 1 addition & 1 deletion docker/tpl-rockylinux-clang-cuda-12.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \
scl enable gcc-toolset-13 ' \
./scripts/uberenv/uberenv.py \
--spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=70 %clang-17 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=86 %clang-17 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spack-env-file=${SRC_DIR}/docker/rocky-spack.yaml \
--project-json=.uberenv_config.json \
--prefix ${GEOSX_TPL_DIR} \
Expand Down
2 changes: 1 addition & 1 deletion docker/tpl-rockylinux-gcc-cuda-12.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
ln -s /usr/lib64/libblas.so.3 /usr/lib64/libblas.so && \
ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \
./scripts/uberenv/uberenv.py \
--spec "+cuda~uncrustify~openmp~pygeosx lai=hypre cuda_arch=70 %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spec "+cuda~uncrustify~openmp~pygeosx lai=hypre cuda_arch=86 %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spack-env-file=${SRC_DIR}/docker/rocky-spack.yaml \
--project-json=.uberenv_config.json \
--prefix ${GEOSX_TPL_DIR} \
Expand Down
2 changes: 1 addition & 1 deletion docker/tpl-ubuntu-clang-cuda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN apt-get install -y --no-install-recommends \
RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
mkdir -p ${GEOSX_TPL_DIR} && \
./scripts/uberenv/uberenv.py \
--spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=70 %clang-10 ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=86 %clang-10 ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
--spack-env-file=${SRC_DIR}/docker/ubuntu20-clang-cuda-spack.yaml \
--project-json=.uberenv_config.json \
--prefix ${GEOSX_TPL_DIR} \
Expand Down
13 changes: 4 additions & 9 deletions scripts/spack_configs/macOS/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ spack:
f77: /opt/homebrew/bin/gfortran
fc: /opt/homebrew/bin/gfortran
flags:
cflags:
cxxflags:
fflags:
cppflags: -I/opt/homebrew/opt/openblas/include
ldflags: -L/opt/homebrew/opt/openblas/lib
operating_system: sequoia
Expand All @@ -45,9 +42,6 @@ spack:
flags:
cppflags: -I/opt/homebrew/opt/openblas/include
ldflags: -L/opt/homebrew/opt/openblas/lib
cflags:
cxxflags:
fflags:
operating_system: sequoia
target: aarch64
modules: []
Expand All @@ -61,6 +55,7 @@ spack:
mpi: [openmpi]
blas: [openblas]
lapack: [openblas]
variants: "~openmp"

openblas:
buildable: False
Expand Down Expand Up @@ -134,7 +129,7 @@ spack:
buildable: False
externals:
- spec: addr2line@2.43.1
prefix: /opt/homebrew/opt/binutils
prefix: /opt/homebrew/opt/binutils

zlib:
buildable: False
Expand All @@ -145,5 +140,5 @@ spack:
python:
buildable: false
externals:
- spec: python@3.13.2
prefix: /opt/homebrew/opt/python@3.13
- spec: python@3.14.3
prefix: /opt/homebrew/opt/python@3.14