Skip to content

Commit

Permalink
remove redundant make.inc. file
Browse files Browse the repository at this point in the history
  • Loading branch information
lu1and10 committed Dec 21, 2023
1 parent b465a45 commit 8eef510
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python_wheel_macos_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Compile libfinufft
run: |
cp make.inc.gh_macos_arm64_whl make.inc
cp make.inc.macosx_arm64 make.inc
make lib
- name: Build wheels
Expand Down
28 changes: 0 additions & 28 deletions make.inc.gh_macos_arm64_whl

This file was deleted.

13 changes: 9 additions & 4 deletions make.inc.macosx_arm64
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# (note that /usr/bin/g++,gcc are aliased to clang/LLVM, so CXX,CC unchanged)

# compile flags for use with clang: (note absence of -march, etc)
CFLAGS = -O3 -arch arm64
CFLAGS = -O3 -arch arm64 -target arm64-apple-macos11

# If you're getting warning messages of the form:
# ld: warning: object file (lib-static/libfinufft.a(finufft1d.o)) was built for
Expand All @@ -22,15 +22,20 @@ CFLAGS = -O3 -arch arm64
CXX=clang++
CC=clang

# assuming libomp and fftw are installed through homebrew
OMP_ROOT = $(shell brew --prefix libomp)
FFTW_ROOT = $(shell brew --prefix fftw)

# taken from makefile...
CFLAGS += -I include -I/usr/local/include -I/opt/homebrew/include -I/opt/homebrew/opt/libomp/include
CFLAGS += -I include -I/usr/local/include -I$(OMP_ROOT)/include -I$(FFTW_ROOT)/include
FFLAGS = $(CFLAGS)
CXXFLAGS = $(CFLAGS)
LIBS += -L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/libomp/lib
LIBS += -L/usr/local/lib -L$(OMP_ROOT)/lib -L$(FFTW_ROOT)/lib
LDFLAGS += -arch arm64 -target arm64-apple-macos11

# OpenMP with clang needs following...
OMPFLAGS = -Xpreprocessor -fopenmp
OMPLIBS = -L/usr/local/lib -L/opt/homebrew/lib -lomp
OMPLIBS = -lomp
# since fftw3_omp doesn't work in OSX, we need...
FFTWOMPSUFFIX=threads

Expand Down

0 comments on commit 8eef510

Please sign in to comment.