From 1b77f89f96ef0994cb447524e464e39cc0914cb1 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 7 Jan 2022 23:17:31 +0300 Subject: [PATCH 01/33] update deps --- external_libs/compute | 2 +- external_libs/eigen | 2 +- external_libs/fast_double_parser | 2 +- external_libs/fmt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external_libs/compute b/external_libs/compute index 36c89134d401..36350b7de849 160000 --- a/external_libs/compute +++ b/external_libs/compute @@ -1 +1 @@ -Subproject commit 36c89134d4013b2e5e45bc55656a18bd6141995a +Subproject commit 36350b7de849300bd3d72a05d8bf890ca405a014 diff --git a/external_libs/eigen b/external_libs/eigen index 8ba1b0f41a79..3af8c262acdf 160000 --- a/external_libs/eigen +++ b/external_libs/eigen @@ -1 +1 @@ -Subproject commit 8ba1b0f41a7950dc3e1d4ed75859e36c73311235 +Subproject commit 3af8c262acdfb50fbfc88e6c640d5d1a582145a9 diff --git a/external_libs/fast_double_parser b/external_libs/fast_double_parser index ace60646c02d..47d76a06f57b 160000 --- a/external_libs/fast_double_parser +++ b/external_libs/fast_double_parser @@ -1 +1 @@ -Subproject commit ace60646c02dc54c57f19d644e49a61e7e7758ec +Subproject commit 47d76a06f57b19cb2e816611297071ba663b7223 diff --git a/external_libs/fmt b/external_libs/fmt index cc09f1a6798c..b6f4ceaed0a0 160000 --- a/external_libs/fmt +++ b/external_libs/fmt @@ -1 +1 @@ -Subproject commit cc09f1a6798c085c325569ef466bcdcffdc266d4 +Subproject commit b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9 From c4ecc0df28344760229d4bd021075468cf0b1c24 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 7 Jan 2022 23:21:54 +0300 Subject: [PATCH 02/33] pin eigen --- external_libs/eigen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_libs/eigen b/external_libs/eigen index 3af8c262acdf..3147391d946b 160000 --- a/external_libs/eigen +++ b/external_libs/eigen @@ -1 +1 @@ -Subproject commit 3af8c262acdfb50fbfc88e6c640d5d1a582145a9 +Subproject commit 3147391d946bb4b6c68edd901f2add6ac1f31f8c From 0431cb5e64f7d15938be2f3a21edfcfa0ed9182c Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 8 Jan 2022 17:12:45 +0300 Subject: [PATCH 03/33] add hidden bazel files to `.Rbuildignore` --- R-package/.Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/R-package/.Rbuildignore b/R-package/.Rbuildignore index 3e552132cf22..9a6fec7e58d7 100644 --- a/R-package/.Rbuildignore +++ b/R-package/.Rbuildignore @@ -38,6 +38,7 @@ src/external_libs/fmt/.*\.md src/external_libs/fmt/.travis.yml src/external_libs/fmt/doc src/external_libs/fmt/support/Android\.mk +src/external_libs/fmt/support/bazel/.bazel.* src/external_libs/fmt/support/.*\.gradle src/external_libs/fmt/support/.*\.pro src/external_libs/fmt/support/.*\.py From 4e3d027fcedf72f2866a12654246f2797986d1c3 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 11 Jan 2022 01:58:59 +0300 Subject: [PATCH 04/33] more verbose test logs --- .ci/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test.sh b/.ci/test.sh index e3d385ab8b71..a929b2b910ff 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -209,7 +209,7 @@ fi make _lightgbm -j4 || exit -1 cd $BUILD_DIRECTORY/python-package && python setup.py install --precompile --user || exit -1 -pytest $BUILD_DIRECTORY/tests || exit -1 +pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 if [[ $TASK == "regular" ]]; then if [[ $PRODUCES_ARTIFACTS == "true" ]]; then From dcae3a5b803e9e99505a8dce48b3b9ea693abc80 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 11 Jan 2022 06:47:36 +0300 Subject: [PATCH 05/33] more verbosity in logs for other tasks --- .ci/test.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index a929b2b910ff..58ef9913ef4d 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -128,7 +128,7 @@ if [[ $TASK == "sdist" ]]; then if [[ $PRODUCES_ARTIFACTS == "true" ]]; then cp $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz $BUILD_ARTIFACTSTAGINGDIRECTORY fi - pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 exit 0 elif [[ $TASK == "bdist" ]]; then if [[ $OS_NAME == "macos" ]]; then @@ -150,7 +150,7 @@ elif [[ $TASK == "bdist" ]]; then fi fi pip install --user $BUILD_DIRECTORY/python-package/dist/*.whl || exit -1 - pytest $BUILD_DIRECTORY/tests || exit -1 + pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 exit 0 fi @@ -162,12 +162,12 @@ if [[ $TASK == "gpu" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--gpu --install-option="--opencl-include-dir=$AMDAPPSDK_PATH/include/" || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --gpu --opencl-include-dir="$AMDAPPSDK_PATH/include/" || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests || exit -1 + pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_GPU=ON -DOpenCL_INCLUDE_DIR=$AMDAPPSDK_PATH/include/ .. @@ -178,12 +178,12 @@ elif [[ $TASK == "cuda" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--cuda || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --cuda || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests || exit -1 + pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_CUDA=ON .. @@ -192,12 +192,12 @@ elif [[ $TASK == "mpi" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--mpi || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --mpi || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests || exit -1 + pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_MPI=ON -DUSE_DEBUG=ON .. From 6af95918d9a405d4b03e19b8060fba3b5de1dcf6 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 11 Jan 2022 19:16:10 +0300 Subject: [PATCH 06/33] empty commit From c7a47abf66b06c25fd54003302a61f619ab1bb78 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 11 Jan 2022 20:07:18 +0300 Subject: [PATCH 07/33] empty commit From ddad5ae34a6ee2649ec8837e33df5557eb9fefb4 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Tue, 11 Jan 2022 21:06:56 +0300 Subject: [PATCH 08/33] empty commit From 1f434348736c8d2c831d5eb86fcbd0454a7b9831 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Wed, 12 Jan 2022 02:36:50 +0300 Subject: [PATCH 09/33] empty commit From bf07b6b773fddc8d090bb38716d8d7c3d08a3919 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Wed, 12 Jan 2022 18:44:05 +0300 Subject: [PATCH 10/33] empty commit From e1649fc4997c778b7092740dc2baffd7fda90bd4 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Wed, 12 Jan 2022 21:22:01 +0300 Subject: [PATCH 11/33] empty commit From e32cc5f07e17efffe7f5f9511b8917e4880265f9 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Wed, 12 Jan 2022 23:26:29 +0300 Subject: [PATCH 12/33] revert fast_double_parser update --- external_libs/fast_double_parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_libs/fast_double_parser b/external_libs/fast_double_parser index 47d76a06f57b..ace60646c02d 160000 --- a/external_libs/fast_double_parser +++ b/external_libs/fast_double_parser @@ -1 +1 @@ -Subproject commit 47d76a06f57b19cb2e816611297071ba663b7223 +Subproject commit ace60646c02dc54c57f19d644e49a61e7e7758ec From 86c8067ac9c039899ffc4798dfaac4da284112c2 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 13 Jan 2022 02:34:41 +0300 Subject: [PATCH 13/33] empty commit From 0c652cd1a8373cbe9cf416f59ca8ab33c80d1735 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Thu, 13 Jan 2022 18:02:15 +0300 Subject: [PATCH 14/33] empty commit From 0e6899371bc0618fdfe2314ac8270b2a69ae4964 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 14 Jan 2022 16:47:49 +0300 Subject: [PATCH 15/33] empty commit From de1e49883dfbb539080dbc7f8b6cc9679ec5d0c0 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 14 Jan 2022 18:25:05 +0300 Subject: [PATCH 16/33] empty commit From 51f5408ae3046f8eee3fa2a86fee483c75c70e31 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 15 Jan 2022 01:02:36 +0300 Subject: [PATCH 17/33] empty commit From 9a387a5240ca5a8150f3ff2e97ffe9d90c38a8df Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 15 Jan 2022 02:53:04 +0300 Subject: [PATCH 18/33] empty commit From 9d172122fdca50cb2bec010bba87d1b9334045f9 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 15 Jan 2022 04:33:31 +0300 Subject: [PATCH 19/33] empty commit From 3535b296c1ab2f7d6997168821c57b592634e47d Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 15 Jan 2022 23:15:35 +0300 Subject: [PATCH 20/33] empty commit From ffdeaaa5506d2a2d19db3550793dd5ab26e822b1 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 16 Jan 2022 01:31:36 +0300 Subject: [PATCH 21/33] empty commit From bf3bcf2ef9c5ec128e6756db3efc0b94f1df79cd Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 16 Jan 2022 02:38:35 +0300 Subject: [PATCH 22/33] empty commit From bd410ba79e37bf740d25e76bb2cc88cfac172aed Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 16 Jan 2022 16:05:46 +0300 Subject: [PATCH 23/33] empty commit From 4c1bbab9b2648823d1c85d1cc3dddddf4605caf8 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 16 Jan 2022 17:12:02 +0300 Subject: [PATCH 24/33] empty commit From 4c1ec7211f821ecc6c9f71d39dd1210eb9bb70b9 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Mon, 17 Jan 2022 16:57:59 +0300 Subject: [PATCH 25/33] empty commit From ea42c60ea08c1373498797c090bbe2478f5eba93 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Mon, 17 Jan 2022 18:53:07 +0300 Subject: [PATCH 26/33] empty commit From a4b439df7548e0354e4e185a793191a8dd484802 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Mon, 17 Jan 2022 21:38:21 +0300 Subject: [PATCH 27/33] revert tests verbosity --- .ci/test.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index 58ef9913ef4d..e3d385ab8b71 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -128,7 +128,7 @@ if [[ $TASK == "sdist" ]]; then if [[ $PRODUCES_ARTIFACTS == "true" ]]; then cp $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz $BUILD_ARTIFACTSTAGINGDIRECTORY fi - pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 exit 0 elif [[ $TASK == "bdist" ]]; then if [[ $OS_NAME == "macos" ]]; then @@ -150,7 +150,7 @@ elif [[ $TASK == "bdist" ]]; then fi fi pip install --user $BUILD_DIRECTORY/python-package/dist/*.whl || exit -1 - pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests || exit -1 exit 0 fi @@ -162,12 +162,12 @@ if [[ $TASK == "gpu" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--gpu --install-option="--opencl-include-dir=$AMDAPPSDK_PATH/include/" || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --gpu --opencl-include-dir="$AMDAPPSDK_PATH/include/" || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_GPU=ON -DOpenCL_INCLUDE_DIR=$AMDAPPSDK_PATH/include/ .. @@ -178,12 +178,12 @@ elif [[ $TASK == "cuda" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--cuda || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --cuda || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_CUDA=ON .. @@ -192,12 +192,12 @@ elif [[ $TASK == "mpi" ]]; then if [[ $METHOD == "pip" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py sdist || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER.tar.gz -v --install-option=--mpi || exit -1 - pytest $BUILD_DIRECTORY/tests/python_package_test -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests/python_package_test || exit -1 exit 0 elif [[ $METHOD == "wheel" ]]; then cd $BUILD_DIRECTORY/python-package && python setup.py bdist_wheel --mpi || exit -1 pip install --user $BUILD_DIRECTORY/python-package/dist/lightgbm-$LGB_VER*.whl -v || exit -1 - pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 + pytest $BUILD_DIRECTORY/tests || exit -1 exit 0 elif [[ $METHOD == "source" ]]; then cmake -DUSE_MPI=ON -DUSE_DEBUG=ON .. @@ -209,7 +209,7 @@ fi make _lightgbm -j4 || exit -1 cd $BUILD_DIRECTORY/python-package && python setup.py install --precompile --user || exit -1 -pytest $BUILD_DIRECTORY/tests -s -vvv || exit -1 +pytest $BUILD_DIRECTORY/tests || exit -1 if [[ $TASK == "regular" ]]; then if [[ $PRODUCES_ARTIFACTS == "true" ]]; then From e77b0013e9725cc82389f76f004e0367ed9295d8 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sat, 12 Feb 2022 04:29:18 +0300 Subject: [PATCH 28/33] test: swap compilers --- .github/workflows/cuda.yml | 6 +++--- .github/workflows/python_package.yml | 4 ++-- .vsts-ci.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 52511e222db2..d5220648da99 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -24,15 +24,15 @@ jobs: matrix: include: - method: source - compiler: gcc + compiler: clang python_version: 3.7 cuda_version: "11.5.1" - method: pip - compiler: clang + compiler: gcc python_version: 3.8 cuda_version: "10.0" - method: wheel - compiler: gcc + compiler: clang python_version: 3.9 cuda_version: "9.0" steps: diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index 8db4c68fc355..411ae7e0f950 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -58,10 +58,10 @@ jobs: export METHOD="${{ matrix.method }}" export PYTHON_VERSION="${{ matrix.python_version }}" if [[ "${{ matrix.os }}" == "macOS-latest" ]]; then - export COMPILER="gcc" + export COMPILER="clang" export OS_NAME="macos" elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - export COMPILER="clang" + export COMPILER="gcc" export OS_NAME="linux" fi export BUILD_DIRECTORY="$GITHUB_WORKSPACE" diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5b53bfb90547..0cbcc93e128d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -25,7 +25,7 @@ jobs: - job: Linux ########################################### variables: - COMPILER: gcc + COMPILER: clang SETUP_CONDA: 'false' OS_NAME: 'linux' PRODUCES_ARTIFACTS: 'true' @@ -79,7 +79,7 @@ jobs: - job: Linux_latest ########################################### variables: - COMPILER: clang + COMPILER: gcc DEBIAN_FRONTEND: 'noninteractive' IN_UBUNTU_LATEST_CONTAINER: 'true' OS_NAME: 'linux' @@ -214,7 +214,7 @@ jobs: - job: macOS ########################################### variables: - COMPILER: clang + COMPILER: gcc OS_NAME: 'macos' PRODUCES_ARTIFACTS: 'true' pool: From 18c36c7fdb202bfaf766345dae37bc444e0dd071 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 13 Feb 2022 00:43:22 +0300 Subject: [PATCH 29/33] empty commit 1 From 1e2de3d108300544457f17173c74552373aea546 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 13 Feb 2022 02:01:39 +0300 Subject: [PATCH 30/33] empty commit 2 From 0a01a3a9681f85478dfa94e66fc17e06c300c18b Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 13 Feb 2022 03:45:43 +0300 Subject: [PATCH 31/33] empty commit 3 From a2e103bdc05fffae8c6b8582d5fd58ddc22e3117 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 13 Feb 2022 19:19:48 +0300 Subject: [PATCH 32/33] empty commit 4 From 846ec92e3bc944b4953db86d315c5565d1a190e6 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Sun, 13 Feb 2022 20:55:34 +0300 Subject: [PATCH 33/33] Revert "test: swap compilers" This reverts commit e77b0013e9725cc82389f76f004e0367ed9295d8. --- .github/workflows/cuda.yml | 6 +++--- .github/workflows/python_package.yml | 4 ++-- .vsts-ci.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index d5220648da99..52511e222db2 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -24,15 +24,15 @@ jobs: matrix: include: - method: source - compiler: clang + compiler: gcc python_version: 3.7 cuda_version: "11.5.1" - method: pip - compiler: gcc + compiler: clang python_version: 3.8 cuda_version: "10.0" - method: wheel - compiler: clang + compiler: gcc python_version: 3.9 cuda_version: "9.0" steps: diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index 411ae7e0f950..8db4c68fc355 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -58,10 +58,10 @@ jobs: export METHOD="${{ matrix.method }}" export PYTHON_VERSION="${{ matrix.python_version }}" if [[ "${{ matrix.os }}" == "macOS-latest" ]]; then - export COMPILER="clang" + export COMPILER="gcc" export OS_NAME="macos" elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - export COMPILER="gcc" + export COMPILER="clang" export OS_NAME="linux" fi export BUILD_DIRECTORY="$GITHUB_WORKSPACE" diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0cbcc93e128d..5b53bfb90547 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -25,7 +25,7 @@ jobs: - job: Linux ########################################### variables: - COMPILER: clang + COMPILER: gcc SETUP_CONDA: 'false' OS_NAME: 'linux' PRODUCES_ARTIFACTS: 'true' @@ -79,7 +79,7 @@ jobs: - job: Linux_latest ########################################### variables: - COMPILER: gcc + COMPILER: clang DEBIAN_FRONTEND: 'noninteractive' IN_UBUNTU_LATEST_CONTAINER: 'true' OS_NAME: 'linux' @@ -214,7 +214,7 @@ jobs: - job: macOS ########################################### variables: - COMPILER: gcc + COMPILER: clang OS_NAME: 'macos' PRODUCES_ARTIFACTS: 'true' pool: