Small tweaks to tractor build to use Intel compilers.

desihub · Jan 2, 2018 · 7aee319 · 7aee319
1 parent 6943791
commit 7aee319
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 26 deletions.
diff --git a/rules/astrometry_net.sh b/rules/astrometry_net.sh
@@ -2,16 +2,37 @@ curl -SL https://github.com/dstndstn/astrometry.net/archive/0.73.tar.gz -o astro
     && tar xzf astrometry.net-0.73.tar.gz \
     && cd astrometry.net-0.73 \
     && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" \
-    LDFLAGS="-L@AUX_PREFIX@/lib -lz" make \
-    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
-    JPEG_INC="-I@AUX_PREFIX@/include" JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
-    CFITS_INC="-I@AUX_PREFIX@/include" CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" \
+    LDFLAGS="-L@AUX_PREFIX@/lib -lz" LDSHARED="@CC@ -shared" \
+    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" \
+    WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
+    JPEG_INC="-I@AUX_PREFIX@/include" \
+    JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
+    CFITS_INC="-I@AUX_PREFIX@/include" \
+    CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" make \
     && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" \
-    LDFLAGS="-L@AUX_PREFIX@/lib -lz" make \
-    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
-    JPEG_INC="-I@AUX_PREFIX@/include" JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
-    CFITS_INC="-I@AUX_PREFIX@/include" CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" \
-    extra \
-    && make install INSTALL_DIR="@AUX_PREFIX@" \
+    LDFLAGS="-L@AUX_PREFIX@/lib -lz" LDSHARED="@CC@ -shared" \
+    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" \
+    WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
+    JPEG_INC="-I@AUX_PREFIX@/include" \
+    JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
+    CFITS_INC="-I@AUX_PREFIX@/include" \
+    CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" make py \
+    && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" \
+    LDFLAGS="-L@AUX_PREFIX@/lib -lz" LDSHARED="@CC@ -shared" \
+    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" \
+    WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
+    JPEG_INC="-I@AUX_PREFIX@/include" \
+    JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
+    CFITS_INC="-I@AUX_PREFIX@/include" \
+    CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" make extra \
+    && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" \
+    LDFLAGS="-L@AUX_PREFIX@/lib -lz" LDSHARED="@CC@ -shared" \
+    WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" \
+    WCSLIB_LIB="-L@AUX_PREFIX@/lib -lwcs" \
+    JPEG_INC="-I@AUX_PREFIX@/include" \
+    JPEG_LIB="-L@AUX_PREFIX@/lib -ljpeg" \
+    CFITS_INC="-I@AUX_PREFIX@/include" \
+    CFITS_LIB="-L@AUX_PREFIX@/lib -lcfitsio -lm" \
+    make install INSTALL_DIR="@AUX_PREFIX@" \
     && cd .. \
     && rm -rf astrometry*
diff --git a/rules/patch_boost b/rules/patch_boost
diff --git a/rules/patch_tractor b/rules/patch_tractor
@@ -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)
++
diff --git a/rules/tractor.sh b/rules/tractor.sh
@@ -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*