Skip to content

Commit

Permalink
Merge branch 'master' into simd
Browse files Browse the repository at this point in the history
  • Loading branch information
christophe-lunarg authored Dec 23, 2023
2 parents 0abd0f0 + 2993560 commit 1d2f73e
Show file tree
Hide file tree
Showing 1,621 changed files with 195,233 additions and 100,586 deletions.
162 changes: 162 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
name: ci
run-name: ${{ github.actor }} is testing out GitHub Actions 🚀

on:
push:
pull_request:
types: [opened]

jobs:
windows-latest:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
std: [98, 11, 14, 17, 20]
config: [Debug, Release]

steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v4
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
- name: CMake Version
run: cmake --version
- run: cmake -S. -B ./build_auto
- run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_avx1_std -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake --build ./build_auto --config ${{matrix.config}}
- run: cmake --build ./build_pure_std --config ${{matrix.config}}
- run: cmake --build ./build_pure_ext --config ${{matrix.config}}
- run: cmake --build ./build_sse2_std --config ${{matrix.config}}
- run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
- run: cmake --build ./build_avx1_std --config ${{matrix.config}}
- run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
- run: cmake --build ./build_avx2_std --config ${{matrix.config}}
- run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_ext
ubuntu-latest:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# compiler: [gcc, clang]
std: [98, 11, 14, 17, 20]
config: [Debug, Release]

steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v4
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
# - name: make (with ${{matrix.compiler}}, for ${{matrix.os}})
# env:
# CC: ${{ matrix.compiler }}
# - name: Compiler Version
# run: ${{matrix.compiler}} --version
- name: CMake Version
run: cmake --version
- run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON
- run: cmake -S. -B ./build_auto
- run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_avx1_std -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_avx2_std -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake --build ./build_auto --config ${{matrix.config}}
- run: cmake --build ./build_pure_std --config ${{matrix.config}}
- run: cmake --build ./build_pure_ext --config ${{matrix.config}}
- run: cmake --build ./build_sse2_std --config ${{matrix.config}}
- run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
- run: cmake --build ./build_avx1_std --config ${{matrix.config}}
- run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
- run: cmake --build ./build_avx2_std --config ${{matrix.config}}
- run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_ext
macos-latest:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
std: [98, 11, 14, 17, 20]
config: [Debug, Release]

steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v4
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
- name: CMake Version
run: cmake --version
- name: Clang Version
run: clang --version
- run: cmake -S. -B ./build_auto
- run: cmake -S. -B ./build_unknown -DGLM_DISABLE_AUTO_DETECTION=ON
- run: cmake -S. -B ./build_pure_std -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_sse2_std -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake -S. -B ./build_avx1_std -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON
- run: cmake -S. -B ./build_avx1_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_CXX_${{matrix.std}}=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- run: cmake --build ./build_auto --config ${{matrix.config}}
- run: cmake --build ./build_unknown --config ${{matrix.config}}
- run: cmake --build ./build_pure_std --config ${{matrix.config}}
- run: cmake --build ./build_pure_ext --config ${{matrix.config}}
- run: cmake --build ./build_sse2_std --config ${{matrix.config}}
- run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
- run: cmake --build ./build_avx1_std --config ${{matrix.config}}
- run: cmake --build ./build_avx1_ext --config ${{matrix.config}}
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_unknown
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_std
- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_ext
42 changes: 42 additions & 0 deletions .github/workflows/make_light_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# A workflow that creates a minimal archive with only the glm/ headers and copying.txt.

name: Make light release

on:
release:
types: [published]

jobs:
make_zip:
runs-on: ubuntu-latest

steps:
- name: Install dependencies
run: sudo apt-get update -y && sudo apt-get install -y zip p7zip

- name: Check out repository code
uses: actions/checkout@v3

- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Prepare layout
run: mv copying.txt glm

- name: Create zip archive
run: zip -r glm-${{ env.RELEASE_VERSION }}-light.zip glm

- name: Create 7z archive
run: 7z a glm-${{ env.RELEASE_VERSION }}-light.7z glm

- uses: actions/upload-artifact@v3
with:
name: glm-${{ env.RELEASE_VERSION }}-light
path: glm-${{ env.RELEASE_VERSION }}-light.*

- name: Add to Release
uses: softprops/action-gh-release@v1
with:
files: |
glm-${{ env.RELEASE_VERSION }}-light.zip
glm-${{ env.RELEASE_VERSION }}-light.7z
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ CMakeFiles
cmake_install.cmake
install_manifest.txt
*.cmake
!glmConfig.cmake
!glmConfig-version.cmake
# ^ May need to add future .cmake files as exceptions

# Test logs
Expand All @@ -52,3 +54,8 @@ Makefile
# local build(s)
build*

/.vs
/.vscode
/CMakeSettings.json
.DS_Store
*.swp
Loading

0 comments on commit 1d2f73e

Please sign in to comment.