Merge branch 'devel' of https://github.com/dilawar/moose-core into devel

Author: Dilawar Singh

.docker/wheel/build_wheels.sh

@@ -4,7 +4,7 @@ set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 NPROC=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
-NUM_WORKERS=$((NPROC/2))
+NUM_WORKERS=$((NPROC-1))
 
 if [ "$TRAVIS" == "true" ]; then
     NUM_WORKERS=2
@@ -27,7 +27,7 @@ GSL_STATIC_LIBS="/usr/local/lib/libgsl.a;/usr/local/lib/libgslcblas.a"
 CMAKE=/usr/bin/cmake3
 
 # Build wheels here.
-for PYV in 36 27; do
+for PYV in 38 37 36 27; do
     PYDIR=/opt/python/cp${PYV}-cp${PYV}m
     cd $MOOSE_SOURCE_DIR
     echo "Building using $PYDIR in $PYVER"
@@ -40,8 +40,11 @@ for PYV in 36 27; do
       $PYTHON -m pip install matplotlib
     fi
     $PYTHON -m pip install wheel
-    $PYTHON setup.py build --with-gsl-static 
-    $PYTHON setup.py bdist_wheel -w $WHEELHOUSE
+    # $PYTHON setup.py build_ext --with-gsl-static 
+    # $PYTHON setup.py bdist_wheel 
+    # Don't build numpy. Use wheel.
+    export GSL_USE_STATIC_LIBRARIES=1
+    $PYTHON -m pip wheel --verbose --no-deps . -w $WHEELHOUSE
     echo "Content of WHEELHOUSE"
     ls -lh $WHEELHOUSE/*.whl
 done

cmake/FindGSL.cmake

@@ -55,13 +55,13 @@ IF(WIN32)
 
 ELSE(WIN32)
     # UNIX
-    IF(GSL_USE_STATIC_LIBRARIES)
+    if(GSL_USE_STATIC_LIBRARIES OR $ENV{GSL_USE_STATIC_LIBRARIES})
         SET(GSL_LIB_NAMES libgsl.a)
         SET(GSL_CBLAS_LIB_NAMES libgslcblas.a)
-    ELSE(GSL_USE_STATIC_LIBRARIES)
+    else()
         SET(GSL_LIB_NAMES gsl)
         SET(GSL_CBLAS_LIB_NAMES gslcblas)
-    ENDIF( )
+    endif( )
 
     if(GSL_ROOT_DIR)
         FIND_LIBRARY(GSL_LIB 

setup.py

@@ -23,8 +23,9 @@
 import datetime
 
 try:
-    cmakeVersion = subprocess.check_output(["cmake", "--version"])
+    cmakeVersion = subprocess.call(["cmake", "--version"])
 except Exception as e:
+    print(e)
     print("[ERROR] cmake is not found. Please install cmake.")
     quit(-1)
 
@@ -57,7 +58,15 @@
 class CMakeExtension(Extension):
     def __init__(self, name, **kwargs):
         # don't invoke the original build_ext for this special extension
-        Extension.__init__(self, name, sources=[], **kwargs)
+        import tempfile
+        # Create a temp file to create a dummy target. This build raises an
+        # exception because sources are empty. With python3 we can fix it by
+        # passing `optional=True` to the argument. With python2 there is no
+        # getaway from it.
+        f = tempfile.NamedTemporaryFile(suffix='.cpp', delete=False)
+        f.write(b'int main() { return 1; }')
+        Extension.__init__(self, name, sources=[f.name], **kwargs)
+        f.close()
 
 class TestCommand(Command):
     user_options = []
@@ -162,6 +171,6 @@ def build_cmake(self, ext):
             , os.path.join('chemUtil', 'rainbow2.pkl')
         ]
     },
-    ext_modules=[CMakeExtension('pymoose', optional=True)],
+    ext_modules=[CMakeExtension('dummy', optional=True)],
     cmdclass={'build_ext': build_ext, 'test': TestCommand},
 )