diff --git a/.github/workflows/linux-cpu-arm64-build.yml b/.github/workflows/linux-cpu-arm64-build.yml index 362331591..692b340b3 100644 --- a/.github/workflows/linux-cpu-arm64-build.yml +++ b/.github/workflows/linux-cpu-arm64-build.yml @@ -70,26 +70,26 @@ jobs: --container-registry onnxruntimebuildcache \ --repository ort_genai_linux_arm64_gha - - name: Docker -- Configure with CMake and GCC + - name: Build with Python run: | - docker run --rm \ - --volume $GITHUB_WORKSPACE:/onnxruntime_src \ - -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "/usr/bin/cmake --preset linux_gcc_cpu_release" - - - name: Docker -- Build with CMake and GCC - run: | - docker run --rm \ - --volume $GITHUB_WORKSPACE:/onnxruntime_src \ - -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "/usr/bin/cmake --build --preset linux_gcc_cpu_release" + set -e -x + docker run \ + --rm \ + --volume $GITHUB_WORKSPACE:/onnxruntime_src \ + -w /onnxruntime_src ort_genai_linux_arm64_gha \ + bash -c " \ + python3 -m pip install wheel && \ + python3 -m pip install requests && \ + python3 build.py --parallel --config=Debug" - name: Docker -- Check test directory run: | docker run --rm \ --volume $GITHUB_WORKSPACE:/onnxruntime_src \ - -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "ls -l /onnxruntime_src/build/cpu/test/" + -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "ls -l /onnxruntime_src/build/Linux/Debug/test/" - name: Docker -- Run tests run: | docker run --rm \ --volume $GITHUB_WORKSPACE:/onnxruntime_src \ - -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/onnxruntime_src/ort/lib/ /onnxruntime_src/build/cpu/unit_tests" + -w /onnxruntime_src ort_genai_linux_arm64_gha bash -c "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/onnxruntime_src/ort/lib/ /onnxruntime_src/build/Linux/Debug/unit_tests" diff --git a/.github/workflows/linux-cpu-x64-build.yml b/.github/workflows/linux-cpu-x64-build.yml index 5fc97369d..3c4d1279c 100644 --- a/.github/workflows/linux-cpu-x64-build.yml +++ b/.github/workflows/linux-cpu-x64-build.yml @@ -70,19 +70,17 @@ jobs: mv microsoft.ml.onnxruntime/${{ env.ORT_NIGHTLY_VERSION }}/runtimes/linux-x64/native/* ort/lib/ cp ort/lib/libonnxruntime.so ort/lib/libonnxruntime.so.1 - - name: Build with CMake and GCC + - name: Build with Python run: | - set -e -x - rm -rf build - cmake --preset linux_gcc_cpu_release - cmake --build --preset linux_gcc_cpu_release + python -m pip install requests + python3 build.py --parallel --config=Debug - name: Install the python wheel and test dependencies run: | python3 -m pip install -r test/python/requirements.txt --user python3 -m pip install -r test/python/cpu/torch/requirements.txt --user python3 -m pip install -r test/python/cpu/ort/requirements.txt --user - python3 -m pip install --user --no-index --no-deps --find-links build/cpu/wheel onnxruntime_genai + python3 -m pip install --user --no-index --no-deps --find-links build/Linux/Debug/wheel onnxruntime_genai - name: Use Dummy HuggingFace Token run: | @@ -92,8 +90,8 @@ jobs: if: always() continue-on-error: true run: | - ls -l ${{ github.workspace }}/build/cpu - ls -l ${{ github.workspace }}/build/cpu/wheel + ls -l ${{ github.workspace }}/build/Linux/Debug + ls -l ${{ github.workspace }}/build/Linux/Debug/wheel # This will also download all the test models to the test/test_models directory # These models are used by the python tests as well as C#, C++ and others. @@ -106,16 +104,16 @@ jobs: run: | export ORTGENAI_LOG_ORT_LIB=1 cd test/csharp - dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/" /p:OrtLibDir="../../ort/lib/" --verbosity normal + dotnet test /p:Configuration=Debug /p:NativeBuildOutputDir="../../build/Linux/Debug/" /p:OrtLibDir="../../ort/lib/" --verbosity normal - name: Build the Java API and Run the Java Tests run: | set -e -x - python3 build.py --config=Release --build_dir build/cpu --build_java --parallel --cmake_generator "Ninja" + python3 build.py --config=Debug --build_dir build/Linux/Debug --build_java --parallel - name: Run tests run: | set -e -x export ORTGENAI_LOG_ORT_LIB=1 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/ort/lib - ./build/cpu/unit_tests + ./build/Linux/Debug/unit_tests diff --git a/.github/workflows/linux-cpu-x64-nightly-build.yml b/.github/workflows/linux-cpu-x64-nightly-build.yml index 61be5eb6f..08e6173e4 100644 --- a/.github/workflows/linux-cpu-x64-nightly-build.yml +++ b/.github/workflows/linux-cpu-x64-nightly-build.yml @@ -22,8 +22,6 @@ jobs: - name: Checkout OnnxRuntime GenAI repo uses: actions/checkout@v2 - - - name: Download OnnxRuntime run: | curl -L -o ${{ env.ort_zip }} ${{ env.ort_url }} @@ -41,19 +39,17 @@ jobs: run: | git submodule update --init --recursive - - name: Build with CMake and clang + - name: Build with Python run: | - set -e -x - rm -rf build - cmake --preset linux_gcc_cpu_release - cmake --build --preset linux_gcc_cpu_release + python3 -m pip install requests + python3 build.py --parallel --config=Release - name: Install the python wheel and test dependencies run: | python3 -m pip install -r test/python/requirements.txt --user python3 -m pip install -r test/python/cpu/torch/requirements.txt --user python3 -m pip install -r test/python/cpu/ort/requirements.txt --user - python3 -m pip install build/cpu/wheel/onnxruntime_genai*.whl --no-deps + python3 -m pip install build/Linux/Release/wheel/onnxruntime_genai*.whl --no-deps - name: Use Dummy HuggingFace Token run: | diff --git a/.github/workflows/linux-gpu-x64-build.yml b/.github/workflows/linux-gpu-x64-build.yml index 843485fa9..8a2463ad7 100644 --- a/.github/workflows/linux-gpu-x64-build.yml +++ b/.github/workflows/linux-gpu-x64-build.yml @@ -85,7 +85,7 @@ jobs: --multiple_repos \ --repository onnxruntimecudabuildx64 - - name: Config with Cmake in Docker + - name: Build with Python in Docker run: | set -e -x docker run \ @@ -94,20 +94,9 @@ jobs: --volume $GITHUB_WORKSPACE:/ort_genai_src \ -w /ort_genai_src onnxruntimecudabuildx64 \ bash -c " \ - /usr/bin/cmake --preset linux_gcc_cuda_release \ - -DMANYLINUX=ON \ - -DPYTHON_EXECUTABLE=${{ env.PYTHON_EXECUTABLE }} " - - - name: Build with Cmake in Docker - run: | - set -e -x - docker run \ - --gpus all \ - --rm \ - --volume $GITHUB_WORKSPACE:/ort_genai_src \ - -w /ort_genai_src onnxruntimecudabuildx64 \ - bash -c " \ - /usr/bin/cmake --build --preset linux_gcc_cuda_release" + ${{ env.PYTHON_EXECUTABLE }} -m pip install requests && \ + ${{ env.PYTHON_EXECUTABLE }} -m pip install wheel && \ + ${{ env.PYTHON_EXECUTABLE }} build.py --use_cuda --cuda_home=/usr/local/cuda-12.2 --parallel --config=Debug" - name: Use Dummy HuggingFace Token run: | @@ -126,7 +115,7 @@ jobs: ${{ env.PYTHON_EXECUTABLE }} -m pip install -r test/python/requirements.txt --user && \ ${{ env.PYTHON_EXECUTABLE }} -m pip install -r test/python/cuda/torch/requirements.txt --user && \ ${{ env.PYTHON_EXECUTABLE }} -m pip install -r test/python/cuda/ort/requirements.txt --user && \ - ${{ env.PYTHON_EXECUTABLE }} -m pip install /ort_genai_src/build/cuda/wheel/onnxruntime_genai*manylinux*.whl --no-deps --user && \ + ${{ env.PYTHON_EXECUTABLE }} -m pip install /ort_genai_src/build/Linux/Debug/wheel/onnxruntime_genai*manylinux*.whl --no-deps --user && \ ${{ env.PYTHON_EXECUTABLE }} test/python/test_onnxruntime_genai.py --cwd test/python --test_models test/test_models --e2e" # TODO: Enable this by adding dotnet to the docker image @@ -148,4 +137,4 @@ jobs: --rm \ --volume /data/ortgenai_pytorch_models:/data/ortgenai_pytorch_models \ --volume $GITHUB_WORKSPACE:/ort_genai_src \ - -w /ort_genai_src onnxruntimecudabuildx64 bash -c "ORTGENAI_LOG_ORT_LIB=1 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/ort_genai_src/build/cuda/ /ort_genai_src/build/cuda/unit_tests" + -w /ort_genai_src onnxruntimecudabuildx64 bash -c "ORTGENAI_LOG_ORT_LIB=1 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/ort_genai_src/build/Linux/Debug/ /ort_genai_src/build/Linux/Debug/unit_tests" diff --git a/.github/workflows/mac-cpu-arm64-build.yml b/.github/workflows/mac-cpu-arm64-build.yml index b675450ab..e0f7bfd62 100644 --- a/.github/workflows/mac-cpu-arm64-build.yml +++ b/.github/workflows/mac-cpu-arm64-build.yml @@ -52,14 +52,11 @@ jobs: mv ${{ env.ORT_PACKAGE_NAME }}/build/native/include ort/ mv ${{ env.ORT_PACKAGE_NAME }}/runtimes/osx-arm64/native/* ort/lib/ - - name: Configure CMake + - name: Build with Python run: | - cmake --preset macos_arm64_cpu_release - - - name: Build with CMake - run: | - cmake --build --preset macos_arm64_cpu_release --parallel - continue-on-error: false + python3 -m pip install requests + python3 -m pip install wheel + python3 build.py --parallel --config=Release --cmake_generator "Unix Makefiles" - name: Install the python wheel and test dependencies run: | @@ -68,7 +65,7 @@ jobs: python3 -m pip install -r test/python/requirements.txt python3 -m pip install -r test/python/macos/torch/requirements.txt python3 -m pip install -r test/python/macos/ort/requirements.txt - python3 -m pip install build/cpu/osx-arm64/wheel/onnxruntime_genai*.whl --no-deps + python3 -m pip install build/MacOS/Release/wheel/onnxruntime_genai*.whl --no-deps - name: Remove the ort lib and header files run: | @@ -78,8 +75,8 @@ jobs: if: always() continue-on-error: true run: | - ls -l ${{ github.workspace }}/build/cpu/osx-arm64 - ls -l ${{ github.workspace }}/build/cpu/osx-arm64/wheel + ls -l ${{ github.workspace }}/build/MacOS/Release + ls -l ${{ github.workspace }}/build/MacOS/Release/wheel # This will also download all the test models to the test/test_models directory # These models are used by the python tests as well as C#, C++ and others. @@ -95,17 +92,18 @@ jobs: run: | export ORTGENAI_LOG_ORT_LIB=1 cd test/csharp - dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/osx-arm64" --verbosity normal + dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/MacOS/Release/Release" --verbosity normal - name: Build the Java API and Run the Java Tests run: | set -e -x source genai-macos-venv/bin/activate - python3 build.py --config=Release --build_dir build/cpu/osx-arm64 --build_java --parallel --cmake_generator "Unix Makefiles" + python3 build.py --config=Release --build_java --parallel --cmake_generator "Unix Makefiles" + dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/MacOS/Release/Release" --verbosity normal - name: Run tests run: | set -e -x export ORTGENAI_LOG_ORT_LIB=1 - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GITHUB_WORKSPACE/build/cpu/osx-arm64 - ./build/cpu/osx-arm64/unit_tests + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GITHUB_WORKSPACE/build/MacOS/Release/Release + ./build/MacOS/Release/Release/unit_tests diff --git a/.github/workflows/win-cpu-arm64-build.yml b/.github/workflows/win-cpu-arm64-build.yml index b6b20cfc6..366eb471d 100644 --- a/.github/workflows/win-cpu-arm64-build.yml +++ b/.github/workflows/win-cpu-arm64-build.yml @@ -11,7 +11,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true env: - binaryDir: 'build/cpu/win-arm64' + binaryDir: 'build/Windows/Release' ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1" ORT_PACKAGE_NAME: "Microsoft.ML.OnnxRuntime" @@ -34,18 +34,6 @@ jobs: with: nuget-version: '5.x' - - name: Setup Java 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - cache: 'gradle' - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: '8.6' - - name: Download OnnxRuntime Nightly shell: powershell run: | @@ -64,15 +52,16 @@ jobs: move ${{ env.ORT_PACKAGE_NAME }}/build/native/include ort/ move ${{ env.ORT_PACKAGE_NAME }}/runtimes/win-arm64/native/* ort/lib/ - - name: Configure CMake + - name: Build with Python run: | - python -m pip install wheel requests + python -m pip install requests + python -m pip install wheel + python build.py --parallel --config=Release - cmake --preset windows_arm64_cpu_release - - - name: Build with CMake + - name: Build the C# API and Run the C# Tests run: | - cmake --build --preset windows_arm64_cpu_release --parallel + cd test\csharp + dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" - name: Install the Python Wheel and Test Dependencies run: | @@ -84,15 +73,6 @@ jobs: run: | python test/python/test_onnxruntime_genai.py --cwd "test\python" --test_models "test\test_models" - - name: Build the C# API and Run the C# Tests - run: | - cd test\csharp - dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" - - - name: Build the Java API and Run the Java Tests - run: | - python build.py --config=Release --build_dir $env:binaryDir --build_java --parallel - - name: Verify Build Artifacts if: always() continue-on-error: true diff --git a/.github/workflows/win-cpu-x64-build.yml b/.github/workflows/win-cpu-x64-build.yml index 3374a3b6d..ab2b7b30c 100644 --- a/.github/workflows/win-cpu-x64-build.yml +++ b/.github/workflows/win-cpu-x64-build.yml @@ -11,7 +11,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true env: - binaryDir: 'build/cpu/win-x64' + binaryDir: 'build/Windows/Debug' ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime&api-version=6.0-preview.1" ORT_PACKAGE_NAME: "Microsoft.ML.OnnxRuntime" @@ -76,13 +76,11 @@ jobs: with: languages: 'cpp' - - name: Configure CMake + - name: Build with Python run: | - cmake --preset windows_x64_cpu_release - - - name: Build with CMake - run: | - cmake --build --preset windows_x64_cpu_release --parallel + python3 -m pip install requests + python3 -m pip install wheel + python3 build.py --parallel --config=Debug --build_java - name: Install the python wheel and test dependencies run: | @@ -102,23 +100,19 @@ jobs: - name: Build the C# API and Run the C# Tests run: | cd test\csharp - dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" --verbosity normal - - - name: Build the Java API and Run the Java Tests - run: | - python3 build.py --config=Release --build_dir $env:binaryDir --build_java --parallel + dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Debug" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" --verbosity normal - name: Verify Build Artifacts if: always() continue-on-error: true run: | - Get-ChildItem -Path $env:GITHUB_WORKSPACE\$env:binaryDir -Recurse + Get-ChildItem -Path $env:GITHUB_WORKSPACE\$env:binaryDir\Debug -Recurse Get-ChildItem -Path $env:GITHUB_WORKSPACE\$env:binaryDir\test -Recurse - name: Run tests run: | - copy $env:GITHUB_WORKSPACE\ort\lib\* .\$env:binaryDir\Release - & .\$env:binaryDir\Release\unit_tests.exe + copy $env:GITHUB_WORKSPACE\ort\lib\* .\$env:binaryDir\Debug + & .\$env:binaryDir\Debug\unit_tests.exe - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/win-cuda-x64-build.yml b/.github/workflows/win-cuda-x64-build.yml index 5cda163d1..a7f5b724b 100644 --- a/.github/workflows/win-cuda-x64-build.yml +++ b/.github/workflows/win-cuda-x64-build.yml @@ -17,7 +17,7 @@ env: cuda_dir: "${{ github.workspace }}\\cuda_sdk" cuda_version: "12.2" CUDA_PATH: ${{ github.workspace }}\\cuda_sdk\\v12.2 - binaryDir: 'build/cuda/win-x64' + binaryDir: 'build/Windows/Debug' ORT_NIGHTLY_REST_API: "https://feeds.dev.azure.com/aiinfra/PublicPackages/_apis/packaging/Feeds/ORT-Nightly/packages?packageNameQuery=Microsoft.ML.OnnxRuntime.Gpu.Windows&api-version=6.0-preview.1" ORT_PACKAGE_NAME: "Microsoft.ML.OnnxRuntime.Gpu.Windows" @@ -61,18 +61,15 @@ jobs: move ${{ env.ORT_PACKAGE_NAME }}/buildTransitive/native/include ort/ move ${{ env.ORT_PACKAGE_NAME }}/runtimes/win-x64/native/* ort/lib/ - - name: Configure CMake - run: | - cmake --preset windows_x64_cuda_release -T cuda=${{ env.cuda_dir }}\\v${{ env.cuda_version }} - - - name: Build with CMake - run: | - cmake --build --preset windows_x64_cuda_release --parallel - - name: Add CUDA to PATH run: | echo "${{ env.cuda_dir }}\\v${{ env.cuda_version }}\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Build with Python + run: | + python -m pip install requests + python build.py --cuda_home=${{ env.cuda_dir }}\\v${{ env.cuda_version }} --parallel --config=Debug + - name: Install the Python Wheel and Test Dependencies run: | python -m pip install -r test\python\requirements.txt @@ -99,11 +96,11 @@ jobs: run: | $env:PATH = "${{ env.cuda_dir }}\\v${{ env.cuda_version }}\\bin;" + $env:PATH cd test\csharp - dotnet test /p:Configuration=release /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" + dotnet test /p:Configuration=debug /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Debug" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" - name: Prepend CUDA to PATH and Run tests run: | $env:PATH = "${{ env.cuda_dir }}\\v${{ env.cuda_version }}\\bin;" + $env:PATH echo "Current PATH variable is: $env:PATH" - copy $env:GITHUB_WORKSPACE\ort\lib\* .\$env:binaryDir\Release - & .\$env:binaryDir\Release\unit_tests.exe \ No newline at end of file + copy $env:GITHUB_WORKSPACE\ort\lib\* .\$env:binaryDir\Debug + & .\$env:binaryDir\Debug\unit_tests.exe \ No newline at end of file diff --git a/.github/workflows/win-directml-x64-build.yml b/.github/workflows/win-directml-x64-build.yml index 678573606..4789535c5 100644 --- a/.github/workflows/win-directml-x64-build.yml +++ b/.github/workflows/win-directml-x64-build.yml @@ -22,7 +22,7 @@ env: d3d12_dir: "Microsoft.Direct3D.D3D12.1.614.1" d3d12_zip: "Microsoft.Direct3D.D3D12.1.614.1.zip" d3d12_url: "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.1" - binaryDir: 'build/directml/win-x64' + binaryDir: 'build/Windows/Release' jobs: @@ -78,13 +78,10 @@ jobs: mv $env:d3d12_dir\build\native\bin\x64\D3D12Core.dll ort\lib mv $env:dml_dir\include\DirectML.h ort\include - - name: Configure CMake + - name: Build with Python run: | - cmake --preset windows_x64_directml_release -DTEST_PHI2=False - - - name: Build with CMake - run: | - cmake --build --preset windows_x64_directml_release --parallel + python -m pip install requests + python build.py --parallel --config=Release --use_dml - name: Install the Python Wheel and Test Dependencies run: | diff --git a/cmake/presets/CMakeLinuxBuildPresets.json b/cmake/presets/CMakeLinuxBuildPresets.json deleted file mode 100644 index 47a0ec704..000000000 --- a/cmake/presets/CMakeLinuxBuildPresets.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeLinuxGccConfigPresets.json", - "CMakeLinuxClangConfigPresets.json" - ], - "buildPresets": [ - { - "name": "linux_gcc_cpu_release_asan", - "configurePreset": "linux_gcc_cpu_release_asan" - }, - { - "name": "linux_gcc_cpu_debug_asan", - "configurePreset": "linux_gcc_cpu_debug_asan" - }, - { - "name": "linux_gcc_cpu_relwithdebinfo_asan", - "configurePreset": "linux_gcc_cpu_relwithdebinfo_asan" - }, - { - "name": "linux_gcc_cpu_minsizerel_asan", - "configurePreset": "linux_gcc_cpu_minsizerel_asan" - }, - { - "name": "linux_gcc_cpu_release", - "configurePreset": "linux_gcc_cpu_release" - }, - { - "name": "linux_gcc_cpu_debug", - "configurePreset": "linux_gcc_cpu_debug" - }, - { - "name": "linux_gcc_cpu_relwithdebinfo", - "configurePreset": "linux_gcc_cpu_relwithdebinfo" - }, - { - "name": "linux_gcc_cpu_minsizerel", - "configurePreset": "linux_gcc_cpu_minsizerel" - }, - { - "name": "linux_clang_cpu_release_asan", - "configurePreset": "linux_clang_cpu_release_asan" - }, - { - "name": "linux_clang_cpu_debug_asan", - "configurePreset": "linux_clang_cpu_debug_asan" - }, - { - "name": "linux_clang_cpu_relwithdebinfo_asan", - "configurePreset": "linux_clang_cpu_relwithdebinfo_asan" - }, - { - "name": "linux_clang_cpu_minsizerel_asan", - "configurePreset": "linux_clang_cpu_minsizerel_asan" - }, - { - "name": "linux_clang_cpu_release", - "configurePreset": "linux_clang_cpu_release" - }, - { - "name": "linux_clang_cpu_debug", - "configurePreset": "linux_clang_cpu_debug" - }, - { - "name": "linux_clang_cpu_relwithdebinfo", - "configurePreset": "linux_clang_cpu_relwithdebinfo" - }, - { - "name": "linux_clang_cpu_minsizerel", - "configurePreset": "linux_clang_cpu_minsizerel" - }, - { - "name": "linux_gcc_cuda_release_asan", - "configurePreset": "linux_gcc_cuda_release_asan" - }, - { - "name": "linux_gcc_cuda_debug_asan", - "configurePreset": "linux_gcc_cuda_debug_asan" - }, - { - "name": "linux_gcc_cuda_relwithdebinfo_asan", - "configurePreset": "linux_gcc_cuda_relwithdebinfo_asan" - }, - { - "name": "linux_gcc_cuda_minsizerel_asan", - "configurePreset": "linux_gcc_cuda_minsizerel_asan" - }, - { - "name": "linux_gcc_cuda_release", - "configurePreset": "linux_gcc_cuda_release" - }, - { - "name": "linux_gcc_cuda_debug", - "configurePreset": "linux_gcc_cuda_debug" - }, - { - "name": "linux_gcc_cuda_relwithdebinfo", - "configurePreset": "linux_gcc_cuda_relwithdebinfo" - }, - { - "name": "linux_gcc_cuda_minsizerel", - "configurePreset": "linux_gcc_cuda_minsizerel" - }, - { - "name": "linux_gcc_rocm_release_asan", - "configurePreset": "linux_gcc_rocm_release_asan" - }, - { - "name": "linux_gcc_rocm_debug_asan", - "configurePreset": "linux_gcc_rocm_debug_asan" - }, - { - "name": "linux_gcc_rocm_relwithdebinfo_asan", - "configurePreset": "linux_gcc_rocm_relwithdebinfo_asan" - }, - { - "name": "linux_gcc_rocm_minsizerel_asan", - "configurePreset": "linux_gcc_rocm_minsizerel_asan" - }, - { - "name": "linux_gcc_rocm_release", - "configurePreset": "linux_gcc_rocm_release" - }, - { - "name": "linux_gcc_rocm_debug", - "configurePreset": "linux_gcc_rocm_debug" - }, - { - "name": "linux_gcc_rocm_relwithdebinfo", - "configurePreset": "linux_gcc_rocm_relwithdebinfo" - }, - { - "name": "linux_gcc_rocm_minsizerel", - "configurePreset": "linux_gcc_rocm_minsizerel" - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeLinuxClangConfigPresets.json b/cmake/presets/CMakeLinuxClangConfigPresets.json deleted file mode 100644 index ce607d2f1..000000000 --- a/cmake/presets/CMakeLinuxClangConfigPresets.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeLinuxDefaultConfigPresets.json" - ], - "configurePresets": [ - { - "name": "linux_clang_cpu_release_asan", - "displayName": "linux clang cpu release asan", - "inherits": [ - "linux_clang_asan_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_clang_cpu_debug_asan", - "displayName": "linux clang cpu debug asan", - "inherits": [ - "linux_clang_asan_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cpu", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_C_FLAGS": "-ggdb3 -O0 -fsanitize=address", - "CMAKE_CXX_FLAGS": "-ggdb3 -O0 -fsanitize=address" - } - }, - { - "name": "linux_clang_cpu_relwithdebinfo_asan", - "displayName": "linux clang cpu relwithdebinfo asan", - "inherits": [ - "linux_clang_asan_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_clang_cpu_minsizerel_asan", - "displayName": "linux clang cpu minsizerel asan", - "inherits": [ - "linux_clang_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cpu", - "cacheVariables": {} - }, - { - "name": "linux_clang_cpu_release", - "displayName": "linux clang cpu release", - "inherits": [ - "linux_clang_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_clang_cpu_debug", - "displayName": "linux clang cpu debug", - "inherits": [ - "linux_clang_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_clang_cpu_relwithdebinfo", - "displayName": "linux clang cpu relwithdebinfo", - "inherits": [ - "linux_clang_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_clang_cpu_minsizerel", - "displayName": "linux clang cpu minsizerel", - "inherits": [ - "linux_clang_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cpu", - "cacheVariables": {} - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeLinuxDefaultConfigPresets.json b/cmake/presets/CMakeLinuxDefaultConfigPresets.json deleted file mode 100644 index c2816213f..000000000 --- a/cmake/presets/CMakeLinuxDefaultConfigPresets.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "version": 6, - "configurePresets": [ - { - "name": "linux_gcc_default", - "generator": "Ninja", - "cacheVariables": { - "CMAKE_POSITION_INDEPENDENT_CODE": "ON", - "CMAKE_EXE_LINKER_FLAGS_INIT": "-Wl,-z,now", - "CMAKE_MODULE_LINKER_FLAGS_INIT": "-Wl,-z,now", - "CMAKE_SHARED_LINKER_FLAGS_INIT": "-Wl,-z,now", - "USE_CUDA": "OFF", - "USE_ROCM": "OFF" - }, - "environment": { - "CC": "gcc", - "CXX": "g++" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - } - }, - { - "name": "linux_gcc_cuda_default", - "inherits": "linux_gcc_default", - "cacheVariables": { - "USE_CUDA": "ON", - "CMAKE_CUDA_ARCHITECTURES": "60;61;70;75;80;86" - } - }, - { - "name": "linux_gcc_rocm_default", - "inherits": "linux_gcc_default", - "cacheVariables": { - "USE_ROCM": "ON" - } - }, - { - "name": "linux_clang_default", - "inherits": "linux_gcc_default", - "environment": { - "CC": "clang", - "CXX": "clang++" - } - }, - { - "name": "linux_gcc_asan_default", - "inherits": "linux_gcc_default", - "cacheVariables": { - "CMAKE_EXE_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address", - "CMAKE_MODULE_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address", - "CMAKE_SHARED_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address" - } - }, - { - "name": "linux_clang_asan_default", - "inherits": "linux_clang_default", - "cacheVariables": { - "CMAKE_EXE_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address -L\\usr\\lib64\\x86_64-unknown-linux-gnu", - "CMAKE_MODULE_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address -L\\usr\\lib64\\x86_64-unknown-linux-gnu", - "CMAKE_SHARED_LINKER_FLAGS_INIT": "-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -fsanitize=address -L\\usr\\lib64\\x86_64-unknown-linux-gnu" - } - }, - { - "name": "linux_release_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_C_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -O3 -pipe ", - "CMAKE_CXX_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -O3 -pipe" - } - }, - { - "name": "linux_relwithdebinfo_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_C_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -O3 -pipe -ggdb3", - "CMAKE_CXX_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -O3 -pipe -ggdb3" - } - }, - { - "name": "linux_debug_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_C_FLAGS": "-ggdb3 -O0", - "CMAKE_CXX_FLAGS": "-ggdb3 -O0 -D_GLIBCXX_DEBUG" - } - }, - { - "name": "linux_minsizerel_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "MinSizeRel", - "CMAKE_C_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -Os -pipe -ggdb3", - "CMAKE_CXX_FLAGS": "-DNDEBUG -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -Os -pipe -ggdb3" - } - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeLinuxGccConfigPresets.json b/cmake/presets/CMakeLinuxGccConfigPresets.json deleted file mode 100644 index bdd58f6c1..000000000 --- a/cmake/presets/CMakeLinuxGccConfigPresets.json +++ /dev/null @@ -1,236 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeLinuxDefaultConfigPresets.json" - ], - "configurePresets": [ - { - "name": "linux_gcc_cpu_release_asan", - "displayName": "linux gcc cpu release asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_debug_asan", - "displayName": "linux gcc cpu debug asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_relwithdebinfo_asan", - "displayName": "linux gcc cpu relwithdebinfo asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_minsizerel_asan", - "displayName": "linux gcc cpu minsizerel asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_release", - "displayName": "linux gcc cpu release", - "inherits": [ - "linux_gcc_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_debug", - "displayName": "linux gcc cpu debug", - "inherits": [ - "linux_gcc_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_relwithdebinfo", - "displayName": "linux gcc cpu relwithdebinfo", - "inherits": [ - "linux_gcc_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cpu_minsizerel", - "displayName": "linux gcc cpu minsizerel", - "inherits": [ - "linux_gcc_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cpu" - }, - { - "name": "linux_gcc_cuda_release_asan", - "displayName": "linux gcc cuda release asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_cuda_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_debug_asan", - "displayName": "linux gcc cuda debug asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_cuda_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_relwithdebinfo_asan", - "displayName": "linux gcc cuda relwithdebinfo asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_cuda_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_minsizerel_asan", - "displayName": "linux gcc cuda minsizerel asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_cuda_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_release", - "displayName": "linux gcc cuda release", - "inherits": [ - "linux_gcc_cuda_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_debug", - "displayName": "linux gcc cuda debug", - "inherits": [ - "linux_gcc_cuda_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_relwithdebinfo", - "displayName": "linux gcc cuda relwithdebinfo", - "inherits": [ - "linux_gcc_cuda_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_cuda_minsizerel", - "displayName": "linux gcc cuda minsizerel", - "inherits": [ - "linux_gcc_cuda_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/cuda" - }, - { - "name": "linux_gcc_rocm_release_asan", - "displayName": "linux gcc rocm release asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_rocm_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_debug_asan", - "displayName": "linux gcc rocm debug asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_rocm_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_relwithdebinfo_asan", - "displayName": "linux gcc rocm relwithdebinfo asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_rocm_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_minsizerel_asan", - "displayName": "linux gcc rocm minsizerel asan", - "inherits": [ - "linux_gcc_asan_default", - "linux_gcc_rocm_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_release", - "displayName": "linux gcc rocm release", - "inherits": [ - "linux_gcc_rocm_default", - "linux_release_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_debug", - "displayName": "linux gcc rocm debug", - "inherits": [ - "linux_gcc_rocm_default", - "linux_debug_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_relwithdebinfo", - "displayName": "linux gcc rocm relwithdebinfo", - "inherits": [ - "linux_gcc_rocm_default", - "linux_relwithdebinfo_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - }, - { - "name": "linux_gcc_rocm_minsizerel", - "displayName": "linux gcc rocm minsizerel", - "inherits": [ - "linux_gcc_rocm_default", - "linux_minsizerel_default" - ], - "binaryDir": "${sourceDir}/build/rocm" - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeMacOSBuildPresets.json b/cmake/presets/CMakeMacOSBuildPresets.json deleted file mode 100644 index d3634c3d2..000000000 --- a/cmake/presets/CMakeMacOSBuildPresets.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeMacOSConfigPresets.json" - ], - "buildPresets": [ - { - "name": "macos_x64_cpu_release", - "configurePreset": "macos_x64_cpu_release" - }, - { - "name": "macos_arm64_cpu_release", - "configurePreset": "macos_arm64_cpu_release" - }, - { - "name": "macos_cpu_debug", - "configurePreset": "macos_cpu_debug" - }, - { - "name": "macos_cpu_relwithdebinfo", - "configurePreset": "macos_cpu_relwithdebinfo" - }, - { - "name": "macos_cpu_minsizerel", - "configurePreset": "macos_cpu_minsizerel" - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeMacOSConfigPresets.json b/cmake/presets/CMakeMacOSConfigPresets.json deleted file mode 100644 index 7de4f39a9..000000000 --- a/cmake/presets/CMakeMacOSConfigPresets.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeLinuxDefaultConfigPresets.json" - ], - "configurePresets": [ - { - "name": "macos_default", - "generator": "Unix Makefiles", - "binaryDir": "${sourceDir}/build/cpu", - "cacheVariables": { - "CMAKE_POSITION_INDEPENDENT_CODE": "ON", - "USE_CUDA": "OFF", - "USE_ROCM": "OFF" - }, - "environment": { - "CC": "clang", - "CXX": "clang++" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - } - }, - { - "name": "macos_release_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_C_FLAGS": " -O3 -pipe", - "CMAKE_CXX_FLAGS": " -O3 -pipe" - } - }, - { - "name": "macos_relwithdebinfo_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_C_FLAGS": "-O3 -pipe -ggdb3", - "CMAKE_CXX_FLAGS": "-O3 -pipe -ggdb3" - } - }, - { - "name": "macos_debug_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_C_FLAGS": "-ggdb3 -O0", - "CMAKE_CXX_FLAGS": "-ggdb3 -O0 -D_GLIBCXX_DEBUG" - } - }, - { - "name": "macos_minsizerel_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "MinSizeRel", - "CMAKE_C_FLAGS": "-Os -pipe -ggdb3", - "CMAKE_CXX_FLAGS": "-Os -pipe -ggdb3" - } - }, - { - "name": "macos_cpu_release", - "displayName": "macos cpu release", - "inherits": [ - "macos_default", - "macos_release_default" - ] - }, - { - "name": "macos_cpu_debug", - "displayName": "macos cpu debug", - "inherits": [ - "macos_default", - "macos_debug_default" - ] - }, - { - "name": "macos_cpu_relwithdebinfo", - "displayName": "macos cpu relwithdebinfo", - "inherits": [ - "macos_default", - "macos_relwithdebinfo_default" - ] - }, - { - "name": "macos_cpu_minsizerel", - "displayName": "macos cpu minsizerel", - "inherits": [ - "macos_default", - "macos_minsizerel_default" - ] - }, - { - "name": "macos_x64_cpu_release", - "inherits": [ - "macos_cpu_release" - ], - "cacheVariables": { - "CMAKE_OSX_ARCHITECTURES": "x86_64" - }, - "displayName": "macos x64 cpu release", - "binaryDir": "${sourceDir}/build/cpu/osx-x64" - }, - { - "name": "macos_arm64_cpu_release", - "inherits": [ - "macos_cpu_release" - ], - "cacheVariables": { - "CMAKE_OSX_ARCHITECTURES": "arm64" - }, - "displayName": "macos arm64 cpu release", - "binaryDir": "${sourceDir}/build/cpu/osx-arm64" - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeWinBuildPresets.json b/cmake/presets/CMakeWinBuildPresets.json deleted file mode 100644 index f7ac7616a..000000000 --- a/cmake/presets/CMakeWinBuildPresets.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "version": 6, - "include": [ - "CMakeWinConfigPresets.json" - ], - "buildPresets": [ - { - "name": "windows_x64_cpu_release_asan", - "configuration": "Release", - "configurePreset": "windows_x64_cpu_release_asan" - }, - { - "name": "windows_x64_cpu_debug_asan", - "configuration": "Debug", - "configurePreset": "windows_x64_cpu_debug_asan" - }, - { - "name": "windows_x64_cpu_relwithdebinfo_asan", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_cpu_relwithdebinfo_asan" - }, - { - "name": "windows_x64_cpu_minsizerel_asan", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_cpu_minsizerel_asan" - }, - { - "name": "windows_x64_cpu_release", - "configuration": "Release", - "configurePreset": "windows_x64_cpu_release" - }, - { - "name": "windows_x64_cpu_debug", - "configuration": "Debug", - "configurePreset": "windows_x64_cpu_debug" - }, - { - "name": "windows_x64_cpu_relwithdebinfo", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_cpu_relwithdebinfo" - }, - { - "name": "windows_x64_cpu_minsizerel", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_cpu_minsizerel" - }, - { - "name": "windows_x64_cuda_release_asan", - "configuration": "Release", - "configurePreset": "windows_x64_cuda_release_asan" - }, - { - "name": "windows_x64_cuda_debug_asan", - "configuration": "Debug", - "configurePreset": "windows_x64_cuda_debug_asan" - }, - { - "name": "windows_x64_cuda_relwithdebinfo_asan", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_cuda_relwithdebinfo_asan" - }, - { - "name": "windows_x64_cuda_minsizerel_asan", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_cuda_minsizerel_asan" - }, - { - "name": "windows_x64_cuda_release", - "configuration": "Release", - "configurePreset": "windows_x64_cuda_release" - }, - { - "name": "windows_x64_cuda_debug", - "configuration": "Debug", - "configurePreset": "windows_x64_cuda_debug" - }, - { - "name": "windows_x64_cuda_relwithdebinfo", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_cuda_relwithdebinfo" - }, - { - "name": "windows_x64_cuda_minsizerel", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_cuda_minsizerel" - }, - { - "name": "windows_x64_directml_release_asan", - "configuration": "Release", - "configurePreset": "windows_x64_directml_release_asan" - }, - { - "name": "windows_x64_directml_debug_asan", - "configuration": "Debug", - "configurePreset": "windows_x64_directml_debug_asan" - }, - { - "name": "windows_x64_directml_relwithdebinfo_asan", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_directml_relwithdebinfo_asan" - }, - { - "name": "windows_x64_directml_minsizerel_asan", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_directml_minsizerel_asan" - }, - { - "name": "windows_x64_directml_release", - "configuration": "Release", - "configurePreset": "windows_x64_directml_release" - }, - { - "name": "windows_x64_directml_debug", - "configuration": "Debug", - "configurePreset": "windows_x64_directml_debug" - }, - { - "name": "windows_x64_directml_relwithdebinfo", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_x64_directml_relwithdebinfo" - }, - { - "name": "windows_x64_directml_minsizerel", - "configuration": "MinSizeRel", - "configurePreset": "windows_x64_directml_minsizerel" - }, - { - "name": "windows_arm64_cpu_relwithdebinfo", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_arm64_cpu_relwithdebinfo" - }, - { - "name": "windows_arm64_cpu_release", - "configuration": "Release", - "configurePreset": "windows_arm64_cpu_release" - }, - { - "name": "windows_arm64_directml_relwithdebinfo", - "configuration": "RelWithDebInfo", - "configurePreset": "windows_arm64_directml_relwithdebinfo" - }, - { - "name": "windows_arm64_directml_release", - "configuration": "Release", - "configurePreset": "windows_arm64_directml_release" - } - ] -} \ No newline at end of file diff --git a/cmake/presets/CMakeWinConfigPresets.json b/cmake/presets/CMakeWinConfigPresets.json deleted file mode 100644 index 3ff252456..000000000 --- a/cmake/presets/CMakeWinConfigPresets.json +++ /dev/null @@ -1,382 +0,0 @@ -{ - "version": 6, - "configurePresets": [ - { - "name": "windows_cpu_default", - "generator": "Visual Studio 17 2022", - "architecture": "x64", - "cacheVariables": { - "CMAKE_EXE_LINKER_FLAGS_INIT": "/profile /DYNAMICBASE", - "CMAKE_MODULE_LINKER_FLAGS_INIT": "/profile /DYNAMICBASE", - "CMAKE_SHARED_LINKER_FLAGS_INIT": "/profile /DYNAMICBASE", - "USE_CUDA": "OFF", - "USE_ROCM": "OFF" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "windows_cuda_default", - "inherits": "windows_cpu_default", - "cacheVariables": { - "USE_CUDA": "ON", - "CMAKE_CUDA_ARCHITECTURES": "60;61;70;75;80;86", - "CMAKE_CUDA_FLAGS_INIT": "/DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 -Xcompiler=\" /MP /guard:cf /Qspectre \" -allow-unsupported-compiler" - } - }, - { - "name": "windows_directml_default", - "inherits": "windows_cpu_default", - "cacheVariables": { - "USE_DML": "ON" - } - }, - { - "name": "windows_release_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob2 /DNDEBUG", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob2 /DNDEBUG" - } - }, - { - "name": "windows_debug_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /Ob0 /Od /RTC1", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /Ob0 /Od /RTC1" - } - }, - { - "name": "windows_relwithdebinfo_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob1 /DNDEBUG", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob1 /DNDEBUG" - } - }, - { - "name": "windows_minsizerel_default", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "MinSizeRel", - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O1 /Ob1 /DNDEBUG", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O1 /Ob1 /DNDEBUG" - } - }, - { - "name": "windows_release_asan_default", - "inherits": "windows_release_default", - "cacheVariables": { - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob2 /DNDEBUG /fsanitize=address", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob2 /DNDEBUG /fsanitize=address" - } - }, - { - "name": "windows_debug_asan_default", - "inherits": "windows_debug_default", - "cacheVariables": { - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /Ob0 /Od /RTC1 /fsanitize=address", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /Ob0 /Od /RTC1 /fsanitize=address" - } - }, - { - "name": "windows_relwithdebinfo_asan_default", - "inherits": "windows_relwithdebinfo_default", - "cacheVariables": { - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob1 /DNDEBUG /fsanitize=address", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O2 /Ob1 /DNDEBUG /fsanitize=address" - } - }, - { - "name": "windows_minsizerel_asan_default", - "inherits": "windows_minsizerel_default", - "cacheVariables": { - "CMAKE_C_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O1 /Ob1 /DNDEBUG /fsanitize=address", - "CMAKE_CXX_FLAGS": "/EHsc /Qspectre /MP /guard:cf /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /O1 /Ob1 /DNDEBUG /fsanitize=address" - } - }, - { - "name": "windows_x64_cpu_release_asan", - "inherits": [ - "windows_release_asan_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu release asan", - "binaryDir": "${sourceDir}/build/cpu_asan" - }, - { - "name": "windows_x64_cpu_debug_asan", - "inherits": [ - "windows_debug_asan_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu debug asan", - "binaryDir": "${sourceDir}/build/cpu_asan" - }, - { - "name": "windows_x64_cpu_relwithdebinfo_asan", - "inherits": [ - "windows_relwithdebinfo_asan_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu relwithdebinfo asan", - "binaryDir": "${sourceDir}/build/cpu_asan" - }, - { - "name": "windows_x64_cpu_minsizerel_asan", - "inherits": [ - "windows_minsizerel_asan_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu minsizerel asan", - "binaryDir": "${sourceDir}/build/cpu_asan" - }, - { - "name": "windows_x64_cpu_release", - "inherits": [ - "windows_release_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu release", - "binaryDir": "${sourceDir}/build/cpu/win-x64" - }, - { - "name": "windows_x64_cpu_debug", - "inherits": [ - "windows_debug_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu debug", - "binaryDir": "${sourceDir}/build/cpu/win-x64" - }, - { - "name": "windows_x64_cpu_relwithdebinfo", - "inherits": [ - "windows_relwithdebinfo_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu relwithdebinfo", - "binaryDir": "${sourceDir}/build/cpu/win-x64" - }, - { - "name": "windows_x64_cpu_minsizerel", - "inherits": [ - "windows_minsizerel_default", - "windows_cpu_default" - ], - "displayName": "windows x64 cpu minsizerel", - "binaryDir": "${sourceDir}/build/cpu/win-x64" - }, - { - "name": "windows_x64_cuda_release_asan", - "inherits": [ - "windows_release_asan_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda release asan", - "binaryDir": "${sourceDir}/build/cuda_asan", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_debug_asan", - "inherits": [ - "windows_debug_asan_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda debug asan", - "binaryDir": "${sourceDir}/build/cuda_asan", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_relwithdebinfo_asan", - "inherits": [ - "windows_relwithdebinfo_asan_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda relwithdebinfo asan", - "binaryDir": "${sourceDir}/build/cuda_asan", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_minsizerel_asan", - "inherits": [ - "windows_minsizerel_asan_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda minsizerel asan", - "binaryDir": "${sourceDir}/build/cuda_asan", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_release", - "inherits": [ - "windows_release_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda release", - "binaryDir": "${sourceDir}/build/cuda/win-x64", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_debug", - "inherits": [ - "windows_debug_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda debug", - "binaryDir": "${sourceDir}/build/cuda/win-x64", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_relwithdebinfo", - "inherits": [ - "windows_relwithdebinfo_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda relwithdebinfo", - "binaryDir": "${sourceDir}/build/cuda/win-x64", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_cuda_minsizerel", - "inherits": [ - "windows_minsizerel_default", - "windows_cuda_default" - ], - "displayName": "windows x64 cuda minsizerel", - "binaryDir": "${sourceDir}/build/cuda/win-x64", - "cacheVariables": { - "USE_CUDA": "ON" - } - }, - { - "name": "windows_x64_directml_release_asan", - "inherits": [ - "windows_release_asan_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml release asan", - "binaryDir": "${sourceDir}/build/directml_asan" - }, - { - "name": "windows_x64_directml_debug_asan", - "inherits": [ - "windows_debug_asan_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml debug asan", - "binaryDir": "${sourceDir}/build/directml_asan" - }, - { - "name": "windows_x64_directml_relwithdebinfo_asan", - "inherits": [ - "windows_relwithdebinfo_asan_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml relwithdebinfo asan", - "binaryDir": "${sourceDir}/build/directml_asan" - }, - { - "name": "windows_x64_directml_minsizerel_asan", - "inherits": [ - "windows_minsizerel_asan_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml minsizerel asan", - "binaryDir": "${sourceDir}/build/directml_asan" - }, - { - "name": "windows_x64_directml_release", - "inherits": [ - "windows_release_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml release", - "binaryDir": "${sourceDir}/build/directml/win-x64" - }, - { - "name": "windows_x64_directml_debug", - "inherits": [ - "windows_debug_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml debug", - "binaryDir": "${sourceDir}/build/directml/win-x64" - }, - { - "name": "windows_x64_directml_relwithdebinfo", - "inherits": [ - "windows_relwithdebinfo_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml relwithdebinfo", - "binaryDir": "${sourceDir}/build/directml/win-x64" - }, - { - "name": "windows_x64_directml_minsizerel", - "inherits": [ - "windows_minsizerel_default", - "windows_directml_default" - ], - "displayName": "windows x64 directml minsizerel", - "binaryDir": "${sourceDir}/build/directml/win-x64" - }, - { - "name": "windows_arm64_cpu_relwithdebinfo", - "inherits": [ - "windows_relwithdebinfo_default", - "windows_cpu_default" - ], - "displayName": "windows arm64 cpu relwithdebinfo", - "binaryDir": "${sourceDir}/build/cpu/win-arm64", - "architecture": "arm64" - }, - { - "name": "windows_arm64_cpu_release", - "inherits": [ - "windows_release_default", - "windows_cpu_default" - ], - "displayName": "windows arm64 cpu release", - "binaryDir": "${sourceDir}/build/cpu/win-arm64", - "architecture": "arm64" - }, - { - "name": "windows_arm64_directml_relwithdebinfo", - "inherits": [ - "windows_relwithdebinfo_default", - "windows_directml_default" - ], - "displayName": "windows arm64 directml relwithdebinfo", - "binaryDir": "${sourceDir}/build/directml/win-arm64", - "architecture": "arm64" - }, - { - "name": "windows_arm64_directml_release", - "inherits": [ - "windows_release_default", - "windows_directml_default" - ], - "displayName": "windows arm64 directml release", - "binaryDir": "${sourceDir}/build/directml/win-arm64", - "architecture": "arm64" - } - ] -} \ No newline at end of file diff --git a/src/models/logits.cpp b/src/models/logits.cpp index d4821c4b1..9e5be5b57 100644 --- a/src/models/logits.cpp +++ b/src/models/logits.cpp @@ -137,8 +137,6 @@ DeviceSpan Logits::Get() { } } - assert(shape_[1] == 1); - #if USE_DML // DML doesn't support on-device scoring yet, so we need to download some data to the CPU if (model_.device_type_ == DeviceType::DML) {