diff --git a/.github/workflows/test_with_MFEM_master.yml b/.github/workflows/test_with_MFEM_master.yml index 4a9de9b2..222c1fbd 100644 --- a/.github/workflows/test_with_MFEM_master.yml +++ b/.github/workflows/test_with_MFEM_master.yml @@ -16,24 +16,23 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] - #python-version: ["3.10"] - #os: [ubuntu-latest] + #python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.10"] os: [ubuntu-20.04] # USE_FLAGS : cuda, parallel, libceed env: - { USE_FLAGS: "000"} - - { USE_FLAGS: "100"} - - { USE_FLAGS: "010"} - - { USE_FLAGS: "110"} +# - { USE_FLAGS: "100"} +# - { USE_FLAGS: "010"} +# - { USE_FLAGS: "110"} include: - os: macos-latest python-version: 3.9 env: {USE_FLAGS: "000"} - - os: [ubuntu-20.04] - python-version: 3.9 - env: {USE_FLAGS: "001"} +# - os: [ubuntu-20.04] +# python-version: 3.9 +# env: {USE_FLAGS: "001"} # runs-on: ${{ matrix.os }} #env: ${{ matrix.env }} diff --git a/mfem/_ser/setup.py b/mfem/_ser/setup.py index b0538f46..9ade870b 100644 --- a/mfem/_ser/setup.py +++ b/mfem/_ser/setup.py @@ -62,20 +62,20 @@ def get_extensions(): libraries = ['mfem'] # remove current directory from path - print("__file__", os.path.abspath(__file__)) + #print("__file__", os.path.abspath(__file__)) if '' in sys.path: sys.path.remove('') items = [x for x in sys.path if os.path.abspath( x) == os.path.dirname(os.path.abspath(__file__))] for x in items: sys.path.remove(x) - print("sys path", sys.path) + #print("sys path", sys.path) # this forces to use compiler written in setup_local.py if cc_ser != '': - os.environ['CC'] = cc_ser + os.environ['CC'] = "echo "#cc_ser if cxx_ser != '': - os.environ['CXX'] = cxx_ser + os.environ['CXX'] = "echo "#cxx_ser modules = ["io_stream", "vtk", "sort_pairs", "datacollection", "cpointers", "symmat", @@ -124,6 +124,8 @@ def get_extensions(): tpl_include = [] for x in mfemstpl.split(' '): if x.startswith("-I"): + if x.find("MacOS") != -1 and x.find(".sdk") != -1: + continue tpl_include.append(x[2:]) include_dirs.extend(tpl_include)