From e027dba08d394099443d0b69f9cd457c18fe3aeb Mon Sep 17 00:00:00 2001
From: Betsy Cannon <betsy@openathena.ai>
Date: Thu, 24 Jul 2025 16:39:09 -0400
Subject: [PATCH 1/2] Don't set CUDA path defaults until after detecting local
 setup

---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 27cff20..94ace59 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,6 @@ CONDA_ENV_NAME := vortex
 
 PYTHON_VERSION := $(shell $(PYTHON) -c 'import sys; print(sys.version_info[0])')
 TARGET_PYTHON_VERSION := 3.11
-CUDA_PATH := /usr/local/cuda
-CUDA_INCLUDE_PATH := $(CUDA_PATH)/include
-CUDA_LIB_PATH := $(CUDA_PATH)/lib64
-CPATH := $(CUDA_INCLUDE_PATH):/usr/local/cuda/include
-CUDACXX := /usr/local/cuda/bin/nvcc
-CUDA_HOME := $(CUDA_PATH)
 
 _detect_cuda_path:
 ifndef CUDA_PATH
@@ -21,9 +15,17 @@ ifndef CUDA_PATH
         # Derive CUDA_PATH by going one directory up from nvcc's bin directory
         CUDA_PATH := $(dir $(NVCC_BIN))..
         CUDA_PATH := $(realpath $(CUDA_PATH))
+    else
+        CUDA_PATH := /usr/local/cuda
     endif
 endif
 
+CUDA_INCLUDE_PATH := $(CUDA_PATH)/include
+CUDA_LIB_PATH := $(CUDA_PATH)/lib64
+CPATH := $(CUDA_INCLUDE_PATH):/usr/local/cuda/include
+CUDACXX := $(CUDA_PATH)/bin/nvcc
+CUDA_HOME ?= $(CUDA_PATH)
+
 _check_env_enabled:
 ifneq ($(VIRTUAL_ENV),)
     $(info Detected active Python venv at $(VIRTUAL_ENV))

From d2864724b1240944bc06f45fc5eb8e00f454aeac Mon Sep 17 00:00:00 2001
From: Betsy Cannon <betsy@openathena.ai>
Date: Fri, 25 Jul 2025 11:55:58 -0400
Subject: [PATCH 2/2] Update rebuild to use setup-full

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 94ace59..9d61838 100644
--- a/Makefile
+++ b/Makefile
@@ -90,4 +90,4 @@ format:
 	ruff check --fix .
 	black -l 120 .
 
-rebuild: clean setup 
+rebuild: clean setup-full