Merge pull request #278 from mfem/improve-install

Cleanup install is merged

Author: sshiraiwa

.github/workflows/build-and-test-callable.yml

@@ -49,7 +49,7 @@ on:
       phases:
         description: 'When true, run each build step individually (mfem, swig, pymfem)'
         type: boolean
-        default: true
+        default: false
 
 jobs:
   build-and-test:
@@ -67,11 +67,11 @@ jobs:
       CUDA_HOME: '/usr/local/cuda'
       # These are all passed to setup.py as one concatenated string
       build-flags: >-
-        ${{ inputs.parallel && '--with-parallel' || '' }}
-        ${{ inputs.cuda && '--with-cuda' || '' }}
-        ${{ inputs.libceed && '--with-libceed' || '' }}
-        ${{ inputs.gslib && '--with-gslib' || '' }}
-        ${{ (!(inputs.mfem-branch == 'default') && format('--mfem-branch=''{0}''', inputs.mfem-branch)) || '' }}
+        ${{ inputs.parallel && '-C"with-parallel=Yes"' || '' }}
+        ${{ inputs.cuda && '-C"with-cuda=Yes"' || '' }}
+        ${{ inputs.libceed && '-C"with-libceed=Yes"' || '' }}
+        ${{ inputs.gslib && '-C"with-gslib=Yes"' || '' }}
+        ${{ (!(inputs.mfem-branch == 'default') && format('-C"mfem-branch=''{0}''"', inputs.mfem-branch)) || '' }}
 
     # -------------------------------------------------------------------------------------------------
     # Begin workflow
@@ -90,8 +90,15 @@ jobs:
     # -------------------------------------------------------------------------------------------------
     - name: Install core dependencies via requirements.txt
       run: |
-        pip install setuptools
-        pip install -r requirements.txt --verbose
+        pip install -U setuptools>=79.0.1
+        pip install -U numpy>=2.0.0
+        pip install -U cmake>=4.0.0
+        pip install -U swig>=4.3
+
+    #- name: Install chrpath on ubuntu
+    #  if: inputs.os == 'ubuntu-latest'
+    #  run: |
+    #    sudo apt-get install chrpath
 
     - name: Install MPI
       if: inputs.parallel
@@ -137,21 +144,26 @@ jobs:
     # -------------------------------------------------------------------------------------------------
     # Build MFEM + SWIG Bindings + PyMFEM
     # -------------------------------------------------------------------------------------------------
-    - name: Build MFEM (step 1)
-      if: inputs.phases
-      run: python setup.py install --ext-only --vv ${{ env.build-flags }}
+    # - name: Build MFEM (step 1)
+    #   if: inputs.phases
+    #   run: pip install -e . -C"--build-option=--ext-only" -C"--build-option=--vv" ${{ env.build-flags }}
+    #   run: python setup.py install --ext-only --vv ${{ env.build-flags }}
+
+    # - name: Build SWIG wrappers (step 2)
+    #   if: inputs.phases
+    #   run: python setup.py install --swig --vv ${{ env.build-flags }}
 
-    - name: Build SWIG wrappers (step 2)
-      if: inputs.phases
-      run: python setup.py install --swig --vv ${{ env.build-flags }}
+    # - name: Build PyMFEM (step 3)
+    #   if: inputs.phases
+    #   run: python setup.py install --skip-ext --skip-swig --vv ${{ env.build-flags }}
 
-    - name: Build PyMFEM (step 3)
-      if: inputs.phases
-      run: python setup.py install --skip-ext --skip-swig --vv ${{ env.build-flags }}
+    #- name: Build all (steps 1-3)
+    #  if: inputs.phases == false
+    #  run: pip install -e . -C"--build-option=--vv" ${{ env.build-flags }}
 
     - name: Build all (steps 1-3)
       if: inputs.phases == false
-      run: python setup.py install --vv ${{ env.build-flags }}
+      run: pip install . ${{ env.build-flags }} --verbose
 
     # -------------------------------------------------------------------------------------------------
     # Run tests

.github/workflows/build-and-test-dispatch.yml

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] # 3.12 is not supported by scipy
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         parallel: [false]
     name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
     uses: ./.github/workflows/build-and-test-callable.yml
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         mfem-branch: [master, default] # 'default' uses a specific commit hash defined in setup.py:repos_sha
-        python-version: ['3.9', '3.10', '3.11', '3.12'] # 3.12 is not supported by scipy
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         parallel: [true]
     name: test-linux | ${{ matrix.mfem-branch }} | ${{ matrix.python-version }} | ${{ matrix.parallel && 'parallel' || 'serial' }}
     uses: ./.github/workflows/build-and-test-callable.yml

.github/workflows/release_binary.yml

@@ -70,7 +70,7 @@ jobs:
 
           CWD=$PWD
           yum install -y zlib-devel
-          yum install -y chrpath
+          #yum install -y chrpath
 
           mkdir dist
 

.github/workflows/testrelease_binary.yml

@@ -69,7 +69,7 @@ jobs:
 
           CWD=$PWD
           yum install -y zlib-devel
-          yum install -y chrpath
+          #yum install -y chrpath
 
           mkdir dist
 

README.md

@@ -29,27 +29,16 @@ $ pip download mfem --no-binary mfem (expand tar.gz file and move to the downloa
 or clone this repository
 $ git clone https://github.com/mfem/PyMFEM.git
 
-# Then, build it from local source
-$ python -m pip install ./ --install-option="--with-parallel" --install-option="--mfem-branch=master"
-or
-$ python setup.py install --with-parallel # it download and build metis/hypre/mfem
-
-# Verbose output
-$ python setup.py install --verbose # SWIG output and CMAKE_VERBOSE_MAKEFILE is on
+# Build it from local source with MPI
+$ pip install ./ -C"with-parallel=Yes" --verbose
 
 # Cleaning
 $ python setup.py clean --all # clean external dependencies + wrapper code
 
-# Choosing compiler
-$ python setup.py install --with-parallel --CC=icc --CXX=icpc --MPICC=mpiicc --MPICXX=mpiicpc
-
 # Run test
 cd test
 python test_examples.py -serial
 
-# For other configurations, see docs/install.txt or help
-$ python setup.py install --help
-
 ```
 
 ## Usage

_build_system/__init__.py

@@ -0,0 +1 @@
+k

_build_system/backend.py

@@ -0,0 +1,31 @@
+from setuptools import build_meta as _orig
+from setuptools.build_meta import *
+
+import build_globals as bglb
+
+
+def get_requires_for_build_wheel(config_settings=None):
+    ret = _orig.get_requires_for_build_wheel(config_settings)
+
+    need_mpi = False
+    if config_settings is not None:
+        for flag in ("with-parallel", ):
+            value = config_settings.pop(flag, "No")
+            if value.upper() in ("YES", "TRUE", "1"):
+                need_mpi = True
+                break
+
+    if need_mpi:
+        ret = ret + ['mpi4py']
+    return ret
+
+
+def get_requires_for_build_sdist(config_settings=None):
+    return _orig.get_requires_for_build_sdist(config_settings)
+
+
+def build_wheel(*args, **kwargs):
+    bglb.cfs = args[1]
+    if bglb.cfs is None:
+        bglb.cfs = {}
+    return _orig.build_wheel(*args, **kwargs)