From 15fe1bf33ecc3ad2405bd452814a5c75f2b9885f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Feb 2021 19:32:42 +0100 Subject: [PATCH] switch to VS2019 for (hopefully) better AVX2 / FMA / etc. support --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- conda-forge.yml | 4 ++++ recipe/conda_build_config.yaml | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d81dc373..b28c5326 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: win_64_cuda_compiler_version10.2: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 1c770972..1d840556 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -7,7 +7,7 @@ cuda_compiler: cuda_compiler_version: - None cxx_compiler: -- vs2017 +- vs2019 libblas: - 3.8 *netlib liblapack: diff --git a/conda-forge.yml b/conda-forge.yml index 1c09752d..df833356 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1 +1,5 @@ +azure: + settings_win: + pool: + vmImage: windows-2019 conda_forge_output_validation: true diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 80298a04..54560478 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,8 @@ cxx_compiler_version: # [osx] # need to downgrade on osx due to a bug that breaks the test suite - 10 # [osx] + +c_compiler: # [win] +- vs2019 # [win] +cxx_compiler: # [win] +- vs2019 # [win]