Add libgfortran link to openblas on linux. Move release file into the…

… package.

.github/workflows/wheels.yml

@@ -13,6 +13,10 @@ on:
 #   schedule:
 #     - cron: '0 4 * * *'
 
+# env:
+#   TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+#   TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+
 jobs:
   py36:
     name: Python 3.6 wheels on ${{ matrix.os }}
@@ -25,7 +29,7 @@ jobs:
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
       CIBW_MANYLINUX_I686_IMAGE: manylinux2014
       CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm'"
+      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran'"
       CIBW_ENVIRONMENT_MACOS: "TOAST_STATIC_DEPS=1"
       CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
       CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
@@ -58,7 +62,7 @@ jobs:
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
       CIBW_MANYLINUX_I686_IMAGE: manylinux2014
       CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm'"
+      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran'"
       CIBW_ENVIRONMENT_MACOS: "TOAST_STATIC_DEPS=1"
       CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
       CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh
@@ -91,7 +95,7 @@ jobs:
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
       CIBW_MANYLINUX_I686_IMAGE: manylinux2014
       CIBW_BUILD_VERBOSITY: 3
-      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm'"
+      CIBW_ENVIRONMENT_LINUX: "TOAST_STATIC_DEPS=1 TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran'"
       CIBW_ENVIRONMENT_MACOS: "TOAST_STATIC_DEPS=1"
       CIBW_BEFORE_BUILD_LINUX: ./wheels/install_deps_linux.sh
       CIBW_BEFORE_BUILD_MACOS: ./wheels/install_deps_osx.sh

CMakeLists.txt

@@ -24,13 +24,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Auxiliary files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
-# Copy the RELEASE file into the build directory
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE"
-    "${CMAKE_CURRENT_BINARY_DIR}/RELEASE"
-    COPYONLY
-)
-
 # Use GNUInstallDirs to install libraries into correct locations on all
 # platforms.
 include(GNUInstallDirs)

src/libtoast/version.cmake

@@ -36,8 +36,8 @@ endif()
 # Separately parse the special "RELEASE" file that is manually updated when
 # making an actual release.
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../RELEASE)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../../RELEASE REL_VERSION)
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../toast/RELEASE)
+    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../toast/RELEASE REL_VERSION)
     string(STRIP "${REL_VERSION}" RELEASE_VERSION)
 else()
     set(RELEASE_VERSION "")

src/toast/CMakeLists.txt

@@ -1,6 +1,13 @@
 # pybind11
 add_subdirectory(pybind11)
 
+# Copy the RELEASE file into the build directory
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/RELEASE"
+    "${CMAKE_CURRENT_BINARY_DIR}/RELEASE"
+    COPYONLY
+)
+
 # Determine our python install location and set up a rule to install the
 # modules
 

src/toast/__init__.py

@@ -29,7 +29,7 @@
     #
     # Just manually read the release file.
     thisdir = os.path.abspath(os.path.dirname(__file__))
-    relfile = os.path.join(thisdir, "..", "..", "RELEASE")
+    relfile = os.path.join(thisdir, "RELEASE")
     with open(relfile, "r") as rel:
         if __version__ is None:
             __version__ = rel.readline().rstrip()