Fix tune (#155)

* Fix tune * Update build_and_upload.yaml
OpenJij · Dec 13, 2023 · add0748 · add0748
1 parent fea6af7
commit add0748
Showing 1 changed file with 9 additions and 112 deletions.
diff --git a/.github/workflows/build_and_upload.yaml b/.github/workflows/build_and_upload.yaml
@@ -94,9 +94,9 @@ jobs:
           export CC=icx
           export CXX=icpx
           export FC=ifx
-          export CFLAGS='-march=haswell -mtune=skylake' 
-          export CXXFLAGS='-march=haswell -mtune=skylake' 
-          export FFLAGS='-march=haswell -mtune=skylake'
+          export CFLAGS='-march=x86-64-v3 -mtune=generic' 
+          export CXXFLAGS='-march=x86-64-v3 -mtune=generic' 
+          export FFLAGS='-march=x86-64-v3 -mtune=generic'
           ${{matrix.python}} -m build --wheel --outdir ./dist
           echo "::endgroup::"
           #. /opt/intel/oneapi/setvars.sh --force  --config="config.txt"
@@ -120,98 +120,7 @@ jobs:
         with:
           name: WHEEL
           path: ./wheelhouse/*.whl
-          retention-days: 30 
-
-  # build_wheels_linux_x86_64_old:
-  #   name: Build wheels linux x86_64 Old
-  #   runs-on: ubuntu-latest
-  #   container: ${{matrix.container}}
-  #   strategy:
-  #     fail-fast: false 
-  #     matrix:  
-  #       include:
-  #        - python: /opt/python/cp38-cp38/bin/python
-  #          container: ghcr.io/openjij/openjij-builder-minimum-manylinux2014_x86_64:latest
-  #        - python: /opt/python/cp39-cp39/bin/python
-  #          container: ghcr.io/openjij/openjij-builder-minimum-manylinux2014_x86_64:latest
-
-  #   steps:
-  #     - uses: actions/checkout@v4       
-  #     - name: Get Python Version
-  #       shell: bash
-  #       run: |
-  #         set -eux
-  #         ls /opt/python
-  #         ${{matrix.python}} --version > python_version.txt
-  #         cat python_version.txt
-  #     - name: Pip-Tools 
-  #       shell: bash
-  #       run: |
-  #         set -eux
-  #         ${{matrix.python}} -m pip install pip-tools 
-  #         ${{matrix.python}} -m piptools compile setup.cfg
-  #         ${{matrix.python}} -m piptools compile build-requirements.in
-  #     - uses: actions/cache@v3
-  #       with:
-  #         path: |
-  #           ~/.cache/pip
-  #           /var/cache/yum/
-  #         key: ${{ runner.os }}-intel-${{ hashFiles('python_version.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('build-requirements.txt') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-intel-${{ hashFiles('python_version.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('build-requirements.txt') }}
-  #           ${{ runner.os }}-intel-${{ hashFiles('python_version.txt') }}-${{ hashFiles('requirements.txt') }}
-  #           ${{ runner.os }}-intel-${{ hashFiles('python_version.txt') }}
-  #           ${{ runner.os }}-intel-
-  #     - name: Install Dependencies
-  #       shell: bash
-  #       run: |
-  #         set -eux
-  #         ${{matrix.python}} -m piptools sync requirements.txt build-requirements.txt 
-  #     - name: Build 
-  #       run: |
-  #         set -x
-  #         echo "::group::Set Intel oneAPI"
-  #         mkdir -p /tmp/tmp
-  #         touch /tmp/tmp/config.txt
-  #         echo "" >> /tmp/tmp/config.txt
-  #         source /opt/intel/oneapi/compiler/latest/env/vars.sh 
-  #         source /opt/intel/oneapi/mkl/latest/env/vars.sh
-  #         source /opt/intel/oneapi/setvars.sh --force  --config="/tmp/tmp/config.txt"
-  #         du -a /opt/intel/oneapi/compiler/latest/linux/bin
-  #         echo "::endgroup::"
-  #         echo "::group::BUILD"
-  #         export CIBUILDWHEEL=1
-  #         export CC=icx
-  #         export CXX=icpx
-  #         export FC=ifx
-  #         export CFLAGS='-march=haswell -mtune=skylake' 
-  #         export CXXFLAGS='-march=haswell -mtune=skylake' 
-  #         export FFLAGS='-march=haswell -mtune=skylake'
-  #         ${{matrix.python}} -m build --wheel --outdir ./dist
-  #         echo "::endgroup::"
-  #         #. /opt/intel/oneapi/setvars.sh --force  --config="config.txt"
-  #         # export FC=ifx
-  #     - name: Show Files 
-  #       id: wheel
-  #       shell: bash
-  #       run: |
-  #         set -x 
-  #         source /opt/intel/oneapi/setvars.sh --force  --config="/tmp/tmp/config.txt"
-  #         ${{matrix.python}} -m auditwheel -h
-  #         ${{matrix.python}} -m auditwheel show -h
-  #         ${{matrix.python}} -m auditwheel repair -h
-  #         du -ah ./dist
-  #         cd dist
-  #         for f in *.whl; do ${{matrix.python}} -m auditwheel show $f; done 
-  #         for f in *.whl; do ${{matrix.python}} -m auditwheel repair -w ../wheelhouse $f; done    
-  #         cd ../wheelhouse
-  #         du -ah ./
-  #     - uses: actions/upload-artifact@v3
-  #       with:
-  #         name: WHEEL
-  #         path: ./wheelhouse/*.whl
-  #         retention-days: 30 
-
+          retention-days: 30   
   build_wheels_linux_aarch64:
     name: Build wheels linux aarch64 ${{matrix.CIBW_BUILD}}
     runs-on: ${{ matrix.os }}
@@ -277,25 +186,13 @@ jobs:
       matrix:  
         include:
           - os: macos-latest
-            arch: x86_64
-            CIBW_PLATFORM: macos  
-            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='12.0'"
-          - os: macos-latest
-            arch: x86_64
+            arch: universal2
             CIBW_PLATFORM: macos  
-            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='11.0' CFLAGS='-mtune=skylake' CXXFLAGS='-mtune=skylake'"
-          - os: macos-latest
-            arch: x86_64
-            CIBW_PLATFORM: macos  
-            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='10.16' CFLAGS='-mtune=skylake' CXXFLAGS='-mtune=skylake'"
-          - os: macos-latest
-            arch: arm64
-            CIBW_PLATFORM: macos
-            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='12.0'"
+            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='13.0'"
           - os: macos-latest
-            arch: arm64
+            arch: universal2
             CIBW_PLATFORM: macos
-            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='11.0'"
+            CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET='10.14'"
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependency 
@@ -326,7 +223,7 @@ jobs:
           - os: windows-latest
             arch: AMD64
             CIBW_PLATFORM: windows 
-            CIBW_ENVIRONMENT: "CFLAGS='-march=haswell -mtune=skylake' CXXFLAGS='-march=haswell -mtune=skylake' CMAKE_TOOLCHAIN_FILE='C:/vcpkg/scripts/buildsystems/vcpkg.cmake'"
+            CIBW_ENVIRONMENT: "CMAKE_TOOLCHAIN_FILE='C:/vcpkg/scripts/buildsystems/vcpkg.cmake'"
     steps:
       - uses: actions/checkout@v4       
       - name: Add msbuild to PATH