Updated Anaconda build files

LutzGross · Jun 23, 2022 · 8394bba · 8394bba
1 parent a47b2ae
commit 8394bba
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 208 deletions.
diff --git a/tools/anaconda/Anaconda2/bld.bat b/tools/anaconda/Anaconda2/bld.bat
diff --git a/tools/anaconda/Anaconda2/build.sh b/tools/anaconda/Anaconda2/build.sh
diff --git a/tools/anaconda/Anaconda2/meta.yaml b/tools/anaconda/Anaconda2/meta.yaml
diff --git a/tools/anaconda/Anaconda3/bld.bat → tools/anaconda/bld.bat b/tools/anaconda/Anaconda3/bld.bat → tools/anaconda/bld.bat
diff --git a/tools/anaconda/Anaconda3/build.sh → tools/anaconda/build.sh b/tools/anaconda/Anaconda3/build.sh → tools/anaconda/build.sh
@@ -10,6 +10,13 @@ CXXFLAGS="${CXXFLAGS} -i sysroot ${CONDA_BUILD_SYSROOT} -fPIC -w -fopenmp"
 TRILINOS=0
 MPI='no'
 
+echo debugout
+python --version
+find ${PREFIX} -iname libboost_python* 2>/dev/null
+find ${PREFIX} -iname Python.h 2>/dev/null
+find ${PREFIX} -iname libpython* 2>/dev/null
+find ${PREFIX} -iname libumfpack* 2>/dev/null
+
 if [ ${CONDA_PY} -eq 38 ]
 then
     BOOST_LIBS="boost_python${CONDA_PY}"
@@ -27,19 +34,15 @@ then
 else
     DEFAULT_HDF5_INCDIR=$PREFIX/include
     DEFAULT_HDF5_LIBDIR=$PREFIX/lib
-    # cd ${SRC_DIR}/silo
-    # ./configure --prefix=${PREFIX} \
-    #         --with-hdf5=${PREFIX}/include,${PREFIX}/lib \
-    #         --with-zlib=$PREFIX/include,$PREFIX/lib
-    # make -j"${CPU_COUNT}"
-    # make -j"${CPU_COUNT}" install
     BOOST_LIBS="boost_python${CONDA_PY}"
     PYTHON_LIB_PATH="${PREFIX}/lib"
     PYTHON_INC_PATH="${PREFIX}/include/python${PY_VER}m"
     PYTHON_LIB_NAME="python${PY_VER}m"
     BUILD_SILO=0
 fi
 
+BUILD_SILO=0
+
 cd ${SRC_DIR}/escript
 if [ ${PY3K} -eq 1 ]
 then
@@ -52,7 +55,8 @@ then
         cxx_extra="-w -fPIC -fdiagnostics-color -std=c++11 " \
         cppunit_prefix=${PREFIX} \
         ld_extra="-L${PREFIX}/lib -lgomp" \
-        mpi=${MPI} \
+        netcdf='no' \
+        openmp=1 \
         omp_flags="-fopenmp" \
         prefix=${PREFIX} \
         pythoncmd=${PREFIX}/bin/python \
@@ -61,8 +65,6 @@ then
         pythonlibname=${PYTHON_LIB_NAME} \
         silo=${BUILD_SILO} \
         silo_prefix=${PREFIX} \
-        trilinos=${TRILINOS} \
-        trilinos_prefix=${PREFIX} \
         umfpack_prefix=${PREFIX} \
         verbose=1 \
         build_full || cat config.log
@@ -89,7 +91,7 @@ else
         trilinos=0 \
         umfpack=0 \
         umfpack_prefix="${PREFIX}" \
-        netcdf=no \
+        netcdf='no' \
         werror=0 \
         verbose=0 \
         compressed_files=0 \

diff --git a/tools/anaconda/Anaconda3/meta.yaml → tools/anaconda/meta.yaml b/tools/anaconda/Anaconda3/meta.yaml → tools/anaconda/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "5.7" %}
+{% set version = "5.9" %}
 
 package:
     name: esys-escript
@@ -8,66 +8,57 @@ source:
       sha256: e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc
       folder: netcdf-cxx4
       patches: netcdf-cxx4.patch
-    - url: https://github.com/esys-escript/esys-escript.github.io/archive/refs/tags/5.7.tar.gz
-      sha256: 413e0a7012c0d384bf1cfb567c87e4c4e13963dc32cdd9cb7c4eabd10ce18af1
+    - url: https://github.com/esys-escript/esys-escript.github.io/archive/refs/tags/5.9pre.tar.gz
+      sha256: 076ffae508aa7b1d9e4b2075e3592a0743146a48e31d3489c892ff223b9ec6a6
       folder: escript
 build:
     skip: True  # [win]
     skip: True  # [osx]
     number: 0
 requirements:
     build:
-        # - {{ compiler('openmpi-mpicxx') }}
         - {{ compiler('cxx') }}
         - scons >3.0.5 
         - cmake
         - make
         - python
-        - numpy  # [win and py>=38]
-        - numpy ==1.15.4  # [win and py<=37]
-        - mumps  # [win]
+        - numpy
+        - mumps
         - git
     host:
         - boost-cpp
         - boost
-        - numpy  # [win and py>=38]
-        - numpy ==1.15.4  # [win and py<=37]
+        - libboost
+        - numpy
         - python 
-        - matplotlib  # [linux]
-        - matplotlib  # [win and py>=38]
-        - matplotlib ==2.2.2  # [win and py<=37]
+        - matplotlib
         - hdf5  # [linux]
-        - libopenblas  # [linux]
+        - libblas  # [linux]
         - pyproj 
         - scipy 
         - suitesparse  # [linux]
-        - sympy  # [win and py>=38]
-        - sympy ==1.1.1  # [win and py<=37]
+        - sympy
         - gmsh  # [win]
-        - mumps  # [win]
-        # - trilinos  # [linux]
-        # - openmpi  # [linux]
-        # - openmpi-mpicxx  # [linux]
+        - mumps
+        - libblas <=3.8.0   # [linux and py==38]
+        - libblas <=3.8.0   # [linux and py==37]
     run:
         - boost-cpp
         - boost
-        - numpy  # [linux]
-        - numpy  # [win and py>=38]
-        - numpy ==1.15.4  # [win and py<=37]
-        - python
-        - matplotlib  # [linux]
-        - matplotlib  # [win and py>=38]
-        - matplotlib ==2.2.2  # [win and py<=37]
+        - libboost
+        - numpy
+        - python 
+        - matplotlib
         - hdf5  # [linux]
-        - pyproj
-        - scipy
-        - sympy  # [win and py>=38]
-        - sympy ==1.1.1  # [win and py<=37]
+        - libblas  # [linux]
+        - pyproj 
+        - scipy 
+        - suitesparse  # [linux]
+        - sympy
         - gmsh  # [win]
-        - mumps  # [win]
-        # - trilinos  # [linux]
-        # - openmpi  # [linux]
-        # - openmpi-mpicxx  # [linux]
+        - mumps
+        - libblas <=3.8.0   # [linux and py==38]
+        - libblas <=3.8.0   # [linux and py==37]
 test:
     commands:
         - run-escript -c

diff --git a/tools/anaconda/Anaconda3/netcdf-cxx4.patch → tools/anaconda/netcdf-cxx4.patch b/tools/anaconda/Anaconda3/netcdf-cxx4.patch → tools/anaconda/netcdf-cxx4.patch