Skip to content
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.

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

Problem with the python example contained in the installation directory #1

Open
wants to merge 65 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
c826564
MKL compliant code
sajidmc Feb 11, 2019
d29c656
Purdue HPC compliant make files
sajidmc Feb 11, 2019
e2ed5e7
Test file for the python extension
sajidmc Feb 11, 2019
57eacbc
Update PythonTest.py
sajidmc Feb 11, 2019
66dc25e
example figure
sajidmc Feb 11, 2019
2cb92b9
Update README
sajidmc Feb 11, 2019
5c8c9d5
Updated the PythonTest.py to quickly give results and output a POV file
Feb 12, 2019
1326092
Merge branch 'master' of https://github.com/sajidmc/S4
Feb 12, 2019
6e3113f
Update README
sajidmc Feb 12, 2019
f677db2
Update README
sajidmc Feb 12, 2019
f7af464
Merge pull request #4 from soamaven/devel
phoebe-p Jul 12, 2019
501df26
fix ordered comparison between pointer and zero error when compiling
phoebe-p Jul 12, 2019
b914507
Merge branch 'devel' of https://github.com/phoebe-p/S4 into devel
phoebe-p Jul 12, 2019
0fa13cd
Update README
phoebe-p Jul 28, 2019
011c068
Update README
phoebe-p Jul 29, 2019
bce9c42
fix call to Eigensystem which causes segmentation faults on some oper…
phoebe-p Jul 30, 2019
e95884a
Merge branch 'devel' into master
phoebe-p Aug 15, 2019
d10717a
Merge pull request #3 from sajidmc/master
phoebe-p Aug 15, 2019
9ff7e1e
Update README
phoebe-p Aug 15, 2019
2ab8224
Update README
phoebe-p Aug 15, 2019
0a74f1f
Update README
phoebe-p Aug 15, 2019
8db930b
Rename README to README.md
phoebe-p Aug 15, 2019
ce899b8
Update README.md
phoebe-p Aug 15, 2019
c7b9882
Update README.md
phoebe-p Aug 15, 2019
08aaebf
Update MacOS/OSX Makefile to include fftw and suitesparse libraries, …
phoebe-p Oct 13, 2020
d89d4b7
Update MacOS/OSX Makefile to include fftw and suitesparse libraries, …
phoebe-p Oct 13, 2020
7320712
add boost library stuff to Makefile.osx
phoebe-p Oct 13, 2020
05cd540
update boost download to newest version@
phoebe-p Oct 13, 2020
4c26146
Update README.md
phoebe-p Oct 14, 2020
9cffe4f
Update README.md
phoebe-p Oct 14, 2020
c37ae14
Update README.md
phoebe-p Oct 14, 2020
69aac7a
This commit significantly changes the behaviour of the Lanczos smooth…
phoebe-p Apr 22, 2021
d4fb979
merge
phoebe-p Apr 22, 2021
37999d5
Update README.md
phoebe-p Oct 12, 2021
394d523
remove lines causing implicit function declaration errors
phoebe-p Dec 21, 2021
2088f8c
Merge pull request #7 from phoebe-p/implicit_dec_error
phoebe-p Dec 21, 2021
ee52adb
Update README.md
phoebe-p Dec 21, 2021
069a795
add new Makefile.m1 for compiling on new Apple silicon (ARM) chips
phoebe-p Feb 22, 2022
5b1d10c
Update readme with instructions for Apple M1 chips
phoebe-p Feb 22, 2022
0e44001
Merge pull request #8 from phoebe-p/M1_Makefile
phoebe-p Feb 22, 2022
247bac9
create Makefile.test
phoebe-p Jan 31, 2023
937b040
update makefile.test
phoebe-p Jan 31, 2023
c535c80
Update and rename Makefile.aarch64
phoebe-p Feb 1, 2023
22b8f4f
Update Makefile.aarch64
phoebe-p Feb 1, 2023
ad4f128
Update README.md
phoebe-p Nov 10, 2023
1b00106
fix issues with M1 Makefile and CHOLMOD_INTLONG
phoebe-p Mar 11, 2024
f666278
Merge branch 'devel' of https://github.com/phoebe-p/S4 into devel
phoebe-p Mar 11, 2024
2acf971
remove Boost from Makefile.m1, since it does not seem to actually lin…
phoebe-p Mar 11, 2024
d669d46
try to fix boost issue
phoebe-p Mar 11, 2024
d2bf1f8
try to fix boost issue
phoebe-p Mar 11, 2024
a1ee39e
try to fix boost issue
phoebe-p Mar 11, 2024
b52efa8
try to fix boost issue
phoebe-p Mar 11, 2024
c8cc536
try to fix boost issue
phoebe-p Mar 11, 2024
2486a8a
try to fix boost issue
phoebe-p Mar 11, 2024
530abeb
new Mac (intel) makefile
phoebe-p Mar 11, 2024
527a039
new Mac (intel) makefile
phoebe-p Mar 11, 2024
2f8afee
update Homebrew path for Intel macos:
phoebe-p Mar 11, 2024
4b67fee
update mac_intel Makefile
phoebe-p Mar 11, 2024
cd2653e
explictly set clang as compiler
phoebe-p Mar 11, 2024
f076f15
try M1 with clang
phoebe-p Mar 11, 2024
dd383c2
Fixed S4 build for macOS on arm64
phoebe-p Mar 11, 2024
9047f22
Merge branch 'phoebe-p:devel' into devel
Abelarm Mar 30, 2024
a15f9e3
Merge pull request #9 from Abelarm/devel
phoebe-p Apr 2, 2024
8aa265b
Rename interpolator (#10)
phoebe-p Jun 26, 2024
c1b8357
simplify boost linking paths again
phoebe-p Jun 27, 2024
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
34 changes: 17 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,22 @@ S4_BINNAME = $(OBJDIR)/S4
S4_LIBNAME = $(OBJDIR)/libS4.a
S4r_LIBNAME = $(OBJDIR)/libS4r.a

#### Download, compile, and install boost serialization lib.
#### Download, compile, and install boost serialization lib.
#### This should all work fine, you must modify BOOST_INC, BOOST_LIBS,
#### and PREFIX if you want to install boost to a different location
#### and PREFIX if you want to install boost to a different location

# Specify the paths to the boost include and lib directories
BOOST_PREFIX=${CURDIR}/S4
BOOST_-L$(BOOST_PREFIX)/lib/PREFIX=${CURDIR}/S4
BOOST_INC = -I$(BOOST_PREFIX)/include
BOOST_LIBS = -L$(BOOST_PREFIX)/lib/ -lboost_serialization
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.gz
BOOST_LIBS = -lboost_serialization
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.74.0/boost_1_74_0.tar.gz
BOOST_FILE=boost.tar.gz
# Target for downloading boost from above URL
$(BOOST_FILE):
wget $(BOOST_URL) -O $(BOOST_FILE)

# Target for extracting boost from archive and compiling. Depends on download target above
${CURDIR}/S4/lib: $(BOOST_FILE)
${CURDIR}/S4/lib: $(BOOST_FILE)
$(eval BOOST_DIR := $(shell tar tzf $(BOOST_FILE) | sed -e 's@/.*@@' | uniq))
@echo Boost dir is $(BOOST_DIR)
tar -xzvf $(BOOST_FILE)
Expand All @@ -120,32 +120,32 @@ boost: $(BOOST_PREFIX)/lib

#### Set the compilation flags

CPPFLAGS = -Wall -I. -IS4 -IS4/RNP -IS4/kiss_fft
CPPFLAGS = -Wall -I. -IS4 -IS4/RNP -IS4/kiss_fft

ifeq ($(S4_PROF), 1)
CPPFLAGS += -g -pg
endif

ifeq ($(S4_DEBUG), 1)
CPPFLAGS += -ggdb
CPPFLAGS += -ggdb
endif

ifeq ($(S4_DEBUG), 2)
CPPFLAGS += -DENABLE_S4_TRACE
CPPFLAGS += -ggdb
CPPFLAGS += -ggdb
endif

ifeq ($(S4_DEBUG), 3)
CPPFLAGS += -DENABLE_S4_TRACE
CPPFLAGS += -DDUMP_MATRICES
CPPFLAGS += -ggdb
CPPFLAGS += -ggdb
endif

ifeq ($(S4_DEBUG), 4)
CPPFLAGS += -DENABLE_S4_TRACE
CPPFLAGS += -DDUMP_MATRICES
CPPFLAGS += -DDUMP_MATRICES_LARGE
CPPFLAGS += -ggdb
CPPFLAGS += -ggdb
endif

ifdef BOOST_INC
Expand Down Expand Up @@ -188,7 +188,7 @@ objdir:
mkdir -p $(OBJDIR)/S4k
mkdir -p $(OBJDIR)/S4r
mkdir -p $(OBJDIR)/modules

S4_LIBOBJS = \
$(OBJDIR)/S4k/S4.o \
$(OBJDIR)/S4k/rcwa.o \
Expand Down Expand Up @@ -288,7 +288,7 @@ $(OBJDIR)/S4k/convert.o: S4/convert.c
$(OBJDIR)/S4k/Eigensystems.o: S4/RNP/Eigensystems.cpp
$(CXX) -c $(CFLAGS) $(CPPFLAGS) $< -o $@




$(OBJDIR)/S4r/Material.o: S4r/Material.cpp S4r/Material.hpp S4r/Types.hpp
Expand All @@ -315,11 +315,11 @@ $(OBJDIR)/S4r/IRA.o: S4r/IRA.cpp S4r/IRA.hpp S4r/Types.hpp
$(CXX) -c $(CFLAGS) $(CPPFLAGS) -I. $< -o $@
$(OBJDIR)/S4r/intersection.o: S4r/intersection.c S4r/intersection.h
$(CC) -c -O3 $< -o $@
$(OBJDIR)/S4r/periodic_off2.o: S4r/periodic_off2.c S4r/periodic_off2.h
$(OBJDIR)/S4r/periodic_off2.o: S4r/periodic_off2.c S4r/periodic_off2.h
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
$(OBJDIR)/S4r/predicates.o: S4r/predicates.c
$(CC) -c -O3 $< -o $@

#### Lua Frontend

$(OBJDIR)/S4k/main_lua.o: S4/main_lua.c objdir
Expand Down Expand Up @@ -352,4 +352,4 @@ S4_pyext: objdir $(S4_LIBNAME)
pip3 install --upgrade ./

clean:
rm -rf $(OBJDIR)
rm -rf $(OBJDIR)
Loading