From 82c37acdc9e77067254a3c243bda9e354211ced6 Mon Sep 17 00:00:00 2001
From: Patrick McCormick <651611+pmccormick@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:56:22 -0700
Subject: [PATCH] Small touch-ups on build details in experiments.

Still finding some issues with kokkos, latest cuda (13.x), and other
details (e.g., host compiler).
---
 kitsune/experiments/inc/cuda.mk        | 3 +--
 kitsune/experiments/raytracer/makefile | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kitsune/experiments/inc/cuda.mk b/kitsune/experiments/inc/cuda.mk
index fa675f8315fbd0..077914da4dad34 100644
--- a/kitsune/experiments/inc/cuda.mk
+++ b/kitsune/experiments/inc/cuda.mk
@@ -1,5 +1,5 @@
 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) \
@@ -7,7 +7,6 @@ ifneq ($(CUDA_PATH),)
     --relocatable-device-code=false \
     --expt-extended-lambda \
     --expt-relaxed-constexpr \
-    -ccbin /usr/bin \
     -O$(KITSUNE_OPTLEVEL)
 
   CLANG_CUDA=$(KITSUNE_PREFIX)/bin/clang 
diff --git a/kitsune/experiments/raytracer/makefile b/kitsune/experiments/raytracer/makefile
index a5ea15aae06722..355bb8c1f373cf 100644
--- a/kitsune/experiments/raytracer/makefile
+++ b/kitsune/experiments/raytracer/makefile
@@ -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
@@ -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