-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Small tweaks to tractor build to use Intel compilers.
- Loading branch information
Showing
4 changed files
with
60 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff -urN tractor-dr6.1_orig/tractor/Makefile tractor-dr6.1/tractor/Makefile | ||
--- tractor-dr6.1_orig/tractor/Makefile 2017-12-18 08:29:59.000000000 -0800 | ||
+++ tractor-dr6.1/tractor/Makefile 2018-01-02 05:35:02.000000000 -0800 | ||
@@ -119,9 +119,9 @@ | ||
ceres.py: ceres.i | ||
swig -python -c++ $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $(GLOG_INC) $(GFLAGS_INC) $< | ||
|
||
-CXXFLAGS := -Wall -fPIC | ||
+#CXXFLAGS := -Wall -fPIC | ||
# DEBUG | ||
-CXXFLAGS += -O0 -g | ||
+#CXXFLAGS += -O0 -g | ||
#CXXFLAGS += -O3 | ||
#CXXLINKFLAGS := -Wl,--no-undefined | ||
#CXXLINKFLAGS := | ||
@@ -131,6 +131,7 @@ | ||
|
||
_ceres$(PYTHON_SO_EXT): ceres.i ceres-tractor.h ceres-tractor.cc | ||
swig -python -c++ $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $< | ||
- g++ $(CXXFLAGS) -c ceres_wrap.cxx $(PYMOD_INC) $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $(GLOG_INC) $(GFLAGS_INC) | ||
- g++ $(CXXFLAGS) -c ceres-tractor.cc $(PYMOD_INC) $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $(GLOG_INC) $(GFLAGS_INC) | ||
- g++ $(CXXFLAGS) $(CXXLINKFLAGS) -o $@ -shared ceres_wrap.o ceres-tractor.o $(CERES_LIB) $(PYMOD_LIB) $(CERES_EXTRA_LIB) | ||
+ $(CXX) $(CXXFLAGS) -c ceres_wrap.cxx $(PYMOD_INC) $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $(GLOG_INC) $(GFLAGS_INC) | ||
+ $(CXX) $(CXXFLAGS) -c ceres-tractor.cc $(PYMOD_INC) $(NUMPY_INC) $(CERES_INC) $(EIGEN_INC) $(GLOG_INC) $(GFLAGS_INC) | ||
+ $(CXX) $(CXXLINKFLAGS) -o $@ -shared ceres_wrap.o ceres-tractor.o $(CERES_LIB) $(PYMOD_LIB) $(CERES_EXTRA_LIB) | ||
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
curl -SL https://github.com/dstndstn/tractor/archive/dr6.1.tar.gz \ | ||
-o tractor-dr6.1.tar.gz \ | ||
&& tar xzf tractor-dr6.1.tar.gz \ | ||
&& cd tractor-dr6.1 \ | ||
&& CERES_LIB="-L@AUX_PREFIX@/lib -lceres" \ | ||
&& cd tractor-dr6.1 && patch -p1 < ../rules/patch_tractor \ | ||
&& CERES_LIB_DIR="@AUX_PREFIX@/lib" \ | ||
CC="@CC@" CFLAGS="@CFLAGS@" LDSHARED="@CC@ -shared" \ | ||
CXX="@CXX@" CXXFLAGS="@CXXFLAGS@" BLAS_LIB="@BLAS@" \ | ||
python setup.py install --with-ceres --prefix="@AUX_PREFIX@" \ | ||
&& cd .. \ | ||
&& rm -rf tractor* |