diff --git a/makefile b/makefile index c9754a37..822f7006 100644 --- a/makefile +++ b/makefile @@ -98,6 +98,8 @@ ifeq ($(FFT),DUCC) DUCC_SRCS := $(DUCC_OBJS:.o=.cc) # FINUFFT's switchable FFT done via this compile directive... CXXFLAGS += -DFINUFFT_USE_DUCC0 +# tell Python skbuild also to use DUCC (note wrapping in quotes)... + PY_CMAKE_ARGS := "-DFINUFFT_USE_DUCC0=ON" else # link against FFTW3 single-threaded (leaves DUCC_OBJS and DUCC_SETUP undef) LIBSFFT += -l$(FFTWNAME) -l$(FFTWNAME)f @@ -115,9 +117,10 @@ ifneq ($(OMP),OFF) MFLAGS += $(MOMPFLAGS) OFLAGS += $(OOMPFLAGS) LIBS += $(OMPLIBS) + LIBSFFT += $(OMPLIBS) # fftw3 multithreaded libs... ifneq ($(FFT),DUCC) - LIBSFFT += -l$(FFTWNAME)_$(FFTWOMPSUFFIX) -l$(FFTWNAME)f_$(FFTWOMPSUFFIX) $(OMPLIBS) + LIBSFFT += -l$(FFTWNAME)_$(FFTWOMPSUFFIX) -l$(FFTWNAME)f_$(FFTWOMPSUFFIX) endif endif @@ -422,7 +425,8 @@ endif # python --------------------------------------------------------------------- python: $(STATICLIB) $(DYNLIB) - FINUFFT_DIR=$(FINUFFT) $(PYTHON) -m pip -v install python/finufft +# note use of CMAKE_ARGS which needs quotes; see scikit-build docs... + FINUFFT_DIR=$(FINUFFT) CMAKE_ARGS=$(PY_CMAKE_ARGS) $(PYTHON) -m pip -v install python/finufft # note to devs: if trouble w/ NumPy, use: pip install ./python --no-deps $(PYTHON) python/finufft/test/run_accuracy_tests.py $(PYTHON) python/finufft/examples/simple1d1.py diff --git a/python/finufft/pyproject.toml b/python/finufft/pyproject.toml index 68f08b8f..3ce0d2e2 100644 --- a/python/finufft/pyproject.toml +++ b/python/finufft/pyproject.toml @@ -11,7 +11,7 @@ build-backend = "scikit_build_core.build" name = "finufft" readme = "README.md" requires-python = ">=3.8" -dependencies = ["numpy >= 1.12.0"] +dependencies = ["numpy >= 1.12.0", "packaging"] authors = [ {name = "Jeremy Magland"}, {name = "Daniel Foreman-Mackey"},