Skip to content

Makefile improvements #71

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

Open
forklady42 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Makefile improvements #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e027dba
Don't set CUDA path defaults until after detecting local setup
forklady42 Jul 24, 2025
d286472
Update rebuild to use setup-full
forklady42 Jul 25, 2025
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
16 changes: 9 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand Down Expand Up @@ -88,4 +90,4 @@ format:
ruff check --fix .
black -l 120 .

rebuild: clean setup
rebuild: clean setup-full