From 3d2ba51a8be0e3bbdf429eb29e9e11088903f344 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Aug 2024 08:26:28 +1100 Subject: [PATCH] LLVM 19 without llvm-openmp --- .ci_support/win_64_.yaml | 4 ++-- recipe/conda_build_config.yaml | 7 ++++++- recipe/meta.yaml | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 0e9675c..82bf585 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -3,13 +3,13 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: - conda-forge main fortran_compiler: - flang fortran_compiler_version: -- '18' +- '19' libblas: - 3.9 *netlib liblapack: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4939dbf..d97ed2c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,5 +12,10 @@ pin_run_as_build: max_pin: x.x +fortran_compiler: # [win] + - flang # [win] fortran_compiler_version: # [win] - - 18 # [win] + - 19 # [win] + +channel_sources: # [win] + - conda-forge/label/llvm_rc,conda-forge # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7dde541..37f976f 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,6 @@ outputs: - liblapack - metis # [not win] - libscotch # [not win] - - llvm-openmp # [win] run: - {{ pin_subpackage('mumps-include', max_pin='x.x.x') }} # [not win] - libscotch # [not win]