Skip to content

Commit

Permalink
Parameterize C++ compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobertPincus
RobertPincus committed Sep 26, 2024
1 parent 1fcb287 commit 95851e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitlab/common.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
#
# Build libraries
#
- make -C build
- make libs
2 changes: 1 addition & 1 deletion .gitlab/levante.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ variables:
variables:
# Core variables:
FC: /sw/spack-levante/nvhpc-22.5-v4oky3/Linux_x86_64/22.5/compilers/bin/nvfortran
CPPC: /sw/spack-levante/nvhpc-22.5-v4oky3/Linux_x86_64/22.5/compilers/bin/nvc++
# Convenience variables:
VERSION_FCFLAGS: --version
NFHOME: /sw/spack-levante/netcdf-fortran-4.5.4-syv4qr
Expand Down Expand Up @@ -62,4 +63,3 @@ nvhpc-gpu-cuda-DP:
extends:
- .dp
- .nvhpc-gpu-openacc

2 changes: 1 addition & 1 deletion build/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COMPILE = $(FC) $(FCFLAGS) $(FCINCLUDE) -c
%.o: %.F90
$(COMPILE) $<

COMPILE_CU = nvc++ -c -std=c++17 -O3 -gopt -DRTE_RRTMGP_GPU_MEMPOOL_CUDA -acc
COMPILE_CU = $(CPPC) -c -std=c++17 -O3 -gopt -DRTE_RRTMGP_GPU_MEMPOOL_CUDA -acc

%.o: %.cu
$(COMPILE_CU) $<
Expand Down

0 comments on commit 95851e2

Please sign in to comment.