diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 352e382a..2895c333 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -95,7 +95,6 @@ jobs: core.exportVariable('CCACHE_DEBUGDIR', String.raw`${{ github.workspace }}/ccache-debug`); core.exportVariable('CCACHE_LOGFILE', String.raw`${{ github.workspace }}/ccache.log`); - - name: Update apt (Linux) if: runner.os == 'Linux' shell: bash @@ -303,7 +302,6 @@ jobs: id-token: write attestations: write contents: read - runs-on: ubuntu-latest if: ${{ github.ref_name }} == 'work' steps: @@ -330,7 +328,6 @@ jobs: id-token: write attestations: write contents: read - runs-on: ubuntu-latest if: github.event_name == 'release' && github.event.action == 'published' steps: diff --git a/conan-profiles/conan-profile-Linux-X64 b/conan-profiles/conan-profile-Linux-X64 index 2b6b06ec..644e250e 100644 --- a/conan-profiles/conan-profile-Linux-X64 +++ b/conan-profiles/conan-profile-Linux-X64 @@ -10,10 +10,15 @@ compiler.libcxx=libstdc++11 [options] openvdb/*:simd=AVX +embree3/*:shared=False +embree3/*:with_tbb=False +embree3/*:sse2=False +embree3/*:sse42=False +embree3/*:avx=False embree3/*:avx2=True -embree3/*:avx512=True +embree3/*:avx512=False [conf] -tools.build:cflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3"] -tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3"] +tools.build:cflags+=["-march=x86-64-v3", "-O3"] +tools.build:cxxflags+=["-march=x86-64-v3", "-O3"] openvdb/*:tools.cmake.cmaketoolchain:extra_variables={ 'USE_CCACHE':'OFF' } diff --git a/debug.sh b/debug.sh index 49bb18f7..030b4fcb 100755 --- a/debug.sh +++ b/debug.sh @@ -11,6 +11,11 @@ #export CIBW_DEBUG_KEEP_CONTAINER=TRUE act \ --action-offline-mode \ + --job build_wheels \ -s GITHUB_TOKEN="$(gh auth token)" \ - --matrix os:ubuntu-latest --matrix python-minor:'12' \ - --artifact-server-path /tmp/artifacts + --matrix os:ubuntu-latest --matrix python-minor:'13' \ + --artifact-server-path /tmp/pyluxcore + +cd /tmp/pyluxcore/1/cibw-wheels-ubuntu-latest-13 +unzip cibw-wheels-ubuntu-latest-13.zip +