Skip to content

Commit

Permalink
Small touch-ups on build details in experiments.
Browse files Browse the repository at this point in the history
Still finding some issues with kokkos, latest cuda (13.x), and other
details (e.g., host compiler).
  • Loading branch information
pmccormick committed Jan 23, 2024
1 parent c65d80c commit 82c37ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions kitsune/experiments/inc/cuda.mk
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
ifneq ($(CUDA_PATH),)
CUDA_ARCH?=sm_90
CUDA_ARCH?=sm_86
NVCC=$(CUDA_PATH)/bin/nvcc
NVCC_C_FLAGS?=-arch=$(CUDA_ARCH)
NVCC_CXX_FLAGS?=-arch=$(CUDA_ARCH) \
--no-exceptions \
--relocatable-device-code=false \
--expt-extended-lambda \
--expt-relaxed-constexpr \
-ccbin /usr/bin \
-O$(KITSUNE_OPTLEVEL)

CLANG_CUDA=$(KITSUNE_PREFIX)/bin/clang
Expand Down
8 changes: 4 additions & 4 deletions kitsune/experiments/raytracer/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ raytracer-kokkos.hip.${host_arch}: raytracer-kokkos.cpp

# cuda version
raytracer-cuda.${host_arch}: raytracer.cu
echo $@
$(TIME_CMD) $(NVCC) $(NVCC_CXX_FLAGS) -o $@ $<
$(FILE_SIZE)
@echo $@
@$(TIME_CMD) $(NVCC) $(NVCC_CXX_FLAGS) -o $@ $<
@$(FILE_SIZE)

# hip version
raytracer-hip.${host_arch}: raytracer-hip.cpp
Expand All @@ -70,7 +70,7 @@ raytracer-hip.${host_arch}: raytracer-hip.cpp

raytracer-hip.clang.${host_arch}: raytracer-hip.cpp
@echo $@
$(KIT_CXX) -x hip -v $(HIPCC_CXX_FLAGS) -o $@ $< -L$(ROCM_PATH)/lib -lamdhip64
@$(KIT_CXX) -x hip -v $(HIPCC_CXX_FLAGS) -o $@ $< -L$(ROCM_PATH)/lib -lamdhip64
@$(FILE_SIZE)
#####
define newline
Expand Down

0 comments on commit 82c37ac

Please sign in to comment.