From 0411b7f53c24d868fa86c790f6efb12d425391f7 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 6 Nov 2025 17:29:02 +0100 Subject: [PATCH 01/28] avoid run export compiler c on win --- conda/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 82c1376..2042499 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,6 +21,9 @@ build: string: py{{ PY_VER }} script_env: - CC=gcc # [win] + ignore_run_exports_from: + # Avoid automatic run export of m2w64 stdlib on windows (that forces hard regression of msvc libs) + - {{ compiler('c') }} # [win] preserve_egg_dir: True script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv From 1010d4a13723cd026148388cddeda7b2bc9c3d01 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 7 Nov 2025 09:05:07 +0100 Subject: [PATCH 02/28] changed relative import to absolute --- src/openalea/ratp/grid.py | 2 +- src/openalea/ratp/micrometeo.py | 2 +- src/openalea/ratp/runratp.py | 2 +- src/openalea/ratp/skyvault.py | 2 +- src/openalea/ratp/vegetation.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openalea/ratp/grid.py b/src/openalea/ratp/grid.py index 479bd75..2999257 100644 --- a/src/openalea/ratp/grid.py +++ b/src/openalea/ratp/grid.py @@ -5,7 +5,7 @@ import pandas import scipy.io as io -from . import pyratp +from openalea.ratp import pyratp from . import vege3D diff --git a/src/openalea/ratp/micrometeo.py b/src/openalea/ratp/micrometeo.py index a9a3f11..5ba2758 100644 --- a/src/openalea/ratp/micrometeo.py +++ b/src/openalea/ratp/micrometeo.py @@ -5,7 +5,7 @@ """ -from . import pyratp +from openalea.ratp import pyratp import numpy as np import math import os diff --git a/src/openalea/ratp/runratp.py b/src/openalea/ratp/runratp.py index 6b2fb26..c55ea52 100644 --- a/src/openalea/ratp/runratp.py +++ b/src/openalea/ratp/runratp.py @@ -4,7 +4,7 @@ """ """ -from . import pyratp +from openalea.ratp import pyratp import numpy as np import os import shutil diff --git a/src/openalea/ratp/skyvault.py b/src/openalea/ratp/skyvault.py index 428b52b..ba55736 100644 --- a/src/openalea/ratp/skyvault.py +++ b/src/openalea/ratp/skyvault.py @@ -5,7 +5,7 @@ """ -from . import pyratp +from openalea.ratp import pyratp #import pyRATP import numpy as np diff --git a/src/openalea/ratp/vegetation.py b/src/openalea/ratp/vegetation.py index 04db579..9c2f43c 100644 --- a/src/openalea/ratp/vegetation.py +++ b/src/openalea/ratp/vegetation.py @@ -5,7 +5,7 @@ """ -from . import pyratp +from openalea.ratp import pyratp #import pyRATP import numpy as np import math From 88f79880376fe26b32db47ea29d4a35134bb5b67 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 7 Nov 2025 09:24:03 +0100 Subject: [PATCH 03/28] revert changed relative import to absolute --- src/openalea/ratp/grid.py | 2 +- src/openalea/ratp/micrometeo.py | 2 +- src/openalea/ratp/runratp.py | 2 +- src/openalea/ratp/skyvault.py | 2 +- src/openalea/ratp/vegetation.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openalea/ratp/grid.py b/src/openalea/ratp/grid.py index 2999257..479bd75 100644 --- a/src/openalea/ratp/grid.py +++ b/src/openalea/ratp/grid.py @@ -5,7 +5,7 @@ import pandas import scipy.io as io -from openalea.ratp import pyratp +from . import pyratp from . import vege3D diff --git a/src/openalea/ratp/micrometeo.py b/src/openalea/ratp/micrometeo.py index 5ba2758..a9a3f11 100644 --- a/src/openalea/ratp/micrometeo.py +++ b/src/openalea/ratp/micrometeo.py @@ -5,7 +5,7 @@ """ -from openalea.ratp import pyratp +from . import pyratp import numpy as np import math import os diff --git a/src/openalea/ratp/runratp.py b/src/openalea/ratp/runratp.py index c55ea52..6b2fb26 100644 --- a/src/openalea/ratp/runratp.py +++ b/src/openalea/ratp/runratp.py @@ -4,7 +4,7 @@ """ """ -from openalea.ratp import pyratp +from . import pyratp import numpy as np import os import shutil diff --git a/src/openalea/ratp/skyvault.py b/src/openalea/ratp/skyvault.py index ba55736..428b52b 100644 --- a/src/openalea/ratp/skyvault.py +++ b/src/openalea/ratp/skyvault.py @@ -5,7 +5,7 @@ """ -from openalea.ratp import pyratp +from . import pyratp #import pyRATP import numpy as np diff --git a/src/openalea/ratp/vegetation.py b/src/openalea/ratp/vegetation.py index 9c2f43c..04db579 100644 --- a/src/openalea/ratp/vegetation.py +++ b/src/openalea/ratp/vegetation.py @@ -5,7 +5,7 @@ """ -from openalea.ratp import pyratp +from . import pyratp #import pyRATP import numpy as np import math From 848b681cd108cead68ece8bdb8904638c70ae0f6 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 7 Nov 2025 09:41:43 +0100 Subject: [PATCH 04/28] revert ignore_run_exports_from to test ci win --- conda/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 2042499..82c1376 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,9 +21,6 @@ build: string: py{{ PY_VER }} script_env: - CC=gcc # [win] - ignore_run_exports_from: - # Avoid automatic run export of m2w64 stdlib on windows (that forces hard regression of msvc libs) - - {{ compiler('c') }} # [win] preserve_egg_dir: True script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv From e8012cd2b48c724b6a84768729ab58d6d2ee1544 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 7 Nov 2025 10:27:31 +0100 Subject: [PATCH 05/28] again ignore_run_exports_from with static lib that I forgot --- conda/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 82c1376..7ff2009 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -21,6 +21,11 @@ build: string: py{{ PY_VER }} script_env: - CC=gcc # [win] + ignore_run_exports_from: + # Avoid automatic run export of m2w64 stdlib on windows (that forces hard regression of msvc libs) + - {{ compiler('c') }} # [win] + # Force static build on Windows to allow skipping run export of m2w64 stdlib + - LDFLAGS=-static -static-libgcc # [win] preserve_egg_dir: True script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv From b5186c4684e422649e762c19f82dd1970ee0018c Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 11:07:51 +0100 Subject: [PATCH 06/28] removed meson from host and explicit pkgs in host --- conda/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 7ff2009..c0f3a52 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,9 +32,8 @@ build: requirements: host: - python - {% for dep in build_deps %} - - {{ dep }} - {% endfor %} + - setuptools + - numpy build: - python {% for dep in build_deps %} From 29220bf04f12593062a610bcb8d41c2e5be0b141 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 11:43:44 +0100 Subject: [PATCH 07/28] try msvc --- conda/conda_build_config.yaml | 2 -- conda/meta.yaml | 12 +++--------- pyproject.toml | 3 +++ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 conda/conda_build_config.yaml diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml deleted file mode 100644 index 543eff2..0000000 --- a/conda/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -c_compiler: - - m2w64-toolchain # [win] \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml index c0f3a52..bc8de11 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,21 +19,15 @@ source: build: number: 0 string: py{{ PY_VER }} - script_env: - - CC=gcc # [win] - ignore_run_exports_from: - # Avoid automatic run export of m2w64 stdlib on windows (that forces hard regression of msvc libs) - - {{ compiler('c') }} # [win] - # Force static build on Windows to allow skipping run export of m2w64 stdlib - - LDFLAGS=-static -static-libgcc # [win] preserve_egg_dir: True script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: host: - python - - setuptools - - numpy + {% for dep in build_deps %} + - {{ dep }} + {% endfor %} build: - python {% for dep in build_deps %} diff --git a/pyproject.toml b/pyproject.toml index 9cfbb33..6cf7998 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,9 @@ fallback_version = "2.1.0.dev0" version_scheme = "guess-next-dev" local_scheme = "no-local-version" +[tool.meson-python.args] +setup = ["--vsenv"] + [project] name = "openalea.ratp" authors = [ From 7f9ee066d0a413e7afb763cb24a8d89a5a667e57 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 11:52:46 +0100 Subject: [PATCH 08/28] add again CC=gcc --- conda/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index bc8de11..82c1376 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,6 +19,8 @@ source: build: number: 0 string: py{{ PY_VER }} + script_env: + - CC=gcc # [win] preserve_egg_dir: True script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv From 0450a28505380209fac0576957fafa40c7c8d5e6 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 13:04:10 +0100 Subject: [PATCH 09/28] WIP --- conda/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 82c1376..af63789 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,7 +22,10 @@ build: script_env: - CC=gcc # [win] preserve_egg_dir: True - script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv + script: + # Force meson-python to use MSVC toolchain instead of m2w64 + - set "MESON_ARGS=--vsenv" + - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: host: From 4cd4e62817afa52f4925240faf224c4657adfe1a Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 13:15:00 +0100 Subject: [PATCH 10/28] WIP --- conda/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index af63789..c014b72 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,8 +19,6 @@ source: build: number: 0 string: py{{ PY_VER }} - script_env: - - CC=gcc # [win] preserve_egg_dir: True script: # Force meson-python to use MSVC toolchain instead of m2w64 From caffae7ba52de85e5796ca723ae5c878dd78daca Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 14:50:59 +0100 Subject: [PATCH 11/28] set CC to cl --- conda/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index c014b72..9a54e39 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -20,6 +20,8 @@ build: number: 0 string: py{{ PY_VER }} preserve_egg_dir: True + script_env: + - CC=cl # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - set "MESON_ARGS=--vsenv" From c74703cb8c1515270a09e5f80b5736b1d913f198 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 15:00:40 +0100 Subject: [PATCH 12/28] set FC to flang --- conda/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 9a54e39..1248503 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,6 +22,7 @@ build: preserve_egg_dir: True script_env: - CC=cl # [win] + - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - set "MESON_ARGS=--vsenv" From b951a24afca5d0d294047b853a14ab1ffc1625b1 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 15:26:58 +0100 Subject: [PATCH 13/28] set FC to flang 2 --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 1248503..23f1dee 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -39,7 +39,7 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - {{ compiler('fortran') }} # [not win] + - {{ compiler('fortran') }} - {{ compiler('c') }} - charset-normalizer run: From 17a53ce9b9ece6f19658201c764590ff6ad04ebc Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 15:59:14 +0100 Subject: [PATCH 14/28] WIP --- src/openalea/ratp/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openalea/ratp/meson.build b/src/openalea/ratp/meson.build index 0362fda..ea3f1f5 100644 --- a/src/openalea/ratp/meson.build +++ b/src/openalea/ratp/meson.build @@ -50,6 +50,7 @@ py.extension_module('pyratp', install : true, link_language: 'fortran', subdir: 'openalea/ratp', + link_args: ['flang'], ) python_sources = [ From e749bcbee3eddf0641f4c93e623c4ed09843a298 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 16:48:33 +0100 Subject: [PATCH 15/28] WIP --- conda/meta.yaml | 2 +- src/openalea/ratp/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 23f1dee..7fb843e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,7 +22,7 @@ build: preserve_egg_dir: True script_env: - CC=cl # [win] - - FC=flang # [win] + - FC=flang-new # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - set "MESON_ARGS=--vsenv" diff --git a/src/openalea/ratp/meson.build b/src/openalea/ratp/meson.build index ea3f1f5..0362fda 100644 --- a/src/openalea/ratp/meson.build +++ b/src/openalea/ratp/meson.build @@ -50,7 +50,6 @@ py.extension_module('pyratp', install : true, link_language: 'fortran', subdir: 'openalea/ratp', - link_args: ['flang'], ) python_sources = [ From 82ad3111054719c690df839e08641e86fbfba280 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 17:02:05 +0100 Subject: [PATCH 16/28] WIP --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 7fb843e..949e151 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,7 +22,7 @@ build: preserve_egg_dir: True script_env: - CC=cl # [win] - - FC=flang-new # [win] + - FC=llvm-flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - set "MESON_ARGS=--vsenv" From 5fad927bd825b3f222eccb2d4dea397b402a5e9c Mon Sep 17 00:00:00 2001 From: baugetfa Date: Wed, 12 Nov 2025 17:36:07 +0100 Subject: [PATCH 17/28] WIP --- conda/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 949e151..0b5e86e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,7 +22,7 @@ build: preserve_egg_dir: True script_env: - CC=cl # [win] - - FC=llvm-flang # [win] + - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - set "MESON_ARGS=--vsenv" @@ -42,6 +42,7 @@ requirements: - {{ compiler('fortran') }} - {{ compiler('c') }} - charset-normalizer + - llvm-openmp run: - python {% for dep in deps + conda_deps %} From 9457a93330a24bc90c03c6a5080102317e7fdd44 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 10:52:18 +0100 Subject: [PATCH 18/28] WIP --- conda/meta.yaml | 3 +-- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 0b5e86e..6e8abb1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,7 +25,7 @@ build: - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - - set "MESON_ARGS=--vsenv" + - set "MESON_ARGS=--vsenv -Dfortran_std=none" - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: @@ -42,7 +42,6 @@ requirements: - {{ compiler('fortran') }} - {{ compiler('c') }} - charset-normalizer - - llvm-openmp run: - python {% for dep in deps + conda_deps %} diff --git a/pyproject.toml b/pyproject.toml index 6cf7998..35f09fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "setuptools", "setuptools_scm", "meson-python", - "numpy", # mandatory for f2py which is distributed with numpy + "numpy>2.0.0", # mandatory for f2py which is distributed with numpy ] #build-backend = "setuptools.build_meta" build-backend = "mesonpy" From ecd1eb3ebfddbfb125c1877adc092dfed8bdcf52 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 11:28:22 +0100 Subject: [PATCH 19/28] try with full compilers set worked locally --- conda/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 6e8abb1..ab6a688 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,7 +25,7 @@ build: - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - - set "MESON_ARGS=--vsenv -Dfortran_std=none" + - set "MESON_ARGS=--vsenv" - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: @@ -39,8 +39,7 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - {{ compiler('fortran') }} - - {{ compiler('c') }} + - compilers - charset-normalizer run: - python From 11d4f7af2123eea0a73d68450fd04c824fd22690 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 12:55:56 +0100 Subject: [PATCH 20/28] forgot a meson arg --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index ab6a688..0e9756b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,7 +25,7 @@ build: - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - - set "MESON_ARGS=--vsenv" + - set "MESON_ARGS=--vsenv -Dfortran_std=none" - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: From 314c83bb032341a8c005c8e94dcdd6c2f87bf60b Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 14:36:19 +0100 Subject: [PATCH 21/28] moved -Dfortran_std=none to pyproject --- conda/meta.yaml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 0e9756b..ab6a688 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,7 +25,7 @@ build: - FC=flang # [win] script: # Force meson-python to use MSVC toolchain instead of m2w64 - - set "MESON_ARGS=--vsenv -Dfortran_std=none" + - set "MESON_ARGS=--vsenv" - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: diff --git a/pyproject.toml b/pyproject.toml index 35f09fd..9aefbbb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ version_scheme = "guess-next-dev" local_scheme = "no-local-version" [tool.meson-python.args] -setup = ["--vsenv"] +setup = ['--vsenv', '-Dfortran_std=none'] [project] name = "openalea.ratp" From 424042c237af3b36e52bd5afe97a34f11a5ff266 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 14:44:57 +0100 Subject: [PATCH 22/28] removed meson_args from meta.yaml that works locally with conda-build --- conda/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index ab6a688..76c1886 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -24,8 +24,6 @@ build: - CC=cl # [win] - FC=flang # [win] script: - # Force meson-python to use MSVC toolchain instead of m2w64 - - set "MESON_ARGS=--vsenv" - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: From eb7fb947cf8b4d31db56ad7f8852799f7dcc1554 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 16:05:33 +0100 Subject: [PATCH 23/28] added buid sh and bat --- conda/bld.bat | 5 +++++ conda/build.sh | 3 +++ conda/meta.yaml | 5 ----- pyproject.toml | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 conda/bld.bat create mode 100644 conda/build.sh diff --git a/conda/bld.bat b/conda/bld.bat new file mode 100644 index 0000000..8a26674 --- /dev/null +++ b/conda/bld.bat @@ -0,0 +1,5 @@ +@echo off +call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" +set "CC=cl" +set "FC=flang-new" +%python% -m pip install . --no-deps --ignore-installed --no-build-isolation -vv \ No newline at end of file diff --git a/conda/build.sh b/conda/build.sh new file mode 100644 index 0000000..4f56bcd --- /dev/null +++ b/conda/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +$PYTHON -m pip install . --no-deps --ignore-installed --no-build-isolation -vv \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml index 76c1886..49b4859 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -20,11 +20,6 @@ build: number: 0 string: py{{ PY_VER }} preserve_egg_dir: True - script_env: - - CC=cl # [win] - - FC=flang # [win] - script: - - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-build-isolation -vv requirements: host: diff --git a/pyproject.toml b/pyproject.toml index 9aefbbb..6c905ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ version_scheme = "guess-next-dev" local_scheme = "no-local-version" [tool.meson-python.args] -setup = ['--vsenv', '-Dfortran_std=none'] +setup = ['-Dfortran_std=none'] [project] name = "openalea.ratp" From bc2ba0328154de772b325f8b0a6ee1ec4fa75632 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 16:24:54 +0100 Subject: [PATCH 24/28] changed compilers to fortran-compiler --- conda/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 49b4859..ea0010b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,7 +32,8 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - compilers + - fortran-compiler + - - {{ compiler('c') }} - charset-normalizer run: - python From e3074b368c5c3051fefcf03bd3e545dfceee4634 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 16:25:26 +0100 Subject: [PATCH 25/28] changed compilers to fortran-compiler --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index ea0010b..7ba290a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -33,7 +33,7 @@ requirements: - {{ dep }} {% endfor %} - fortran-compiler - - - {{ compiler('c') }} + - {{ compiler('c') }} - charset-normalizer run: - python From 353c271e5464e900b3c7145c473729806a74b1e1 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Thu, 13 Nov 2025 16:33:25 +0100 Subject: [PATCH 26/28] back to compilers with MESON_RSP_THRESHOLD --- conda/bld.bat | 1 + conda/meta.yaml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/bld.bat b/conda/bld.bat index 8a26674..eb0ab33 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -2,4 +2,5 @@ call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set "CC=cl" set "FC=flang-new" +set "MESON_RSP_THRESHOLD=320000" %python% -m pip install . --no-deps --ignore-installed --no-build-isolation -vv \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml index 7ba290a..49b4859 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,8 +32,7 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - fortran-compiler - - {{ compiler('c') }} + - compilers - charset-normalizer run: - python From b7a120fa841bd696fb34d237b6e170d42d391749 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Fri, 14 Nov 2025 11:15:20 +0100 Subject: [PATCH 27/28] tryied without compilers --- conda/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 49b4859..83976f1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,7 +32,13 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - compilers + - {{ compiler('c' }} + - flang + - libflang + - libllvm19 + - lld + - llvm-tools + - vs2022_win-64 - charset-normalizer run: - python From d8f6f736d45faeeb721fedb923b756b662e4c709 Mon Sep 17 00:00:00 2001 From: baugetfa Date: Mon, 17 Nov 2025 10:23:38 +0100 Subject: [PATCH 28/28] [no ci] revert --- conda/meta.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 83976f1..49b4859 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,13 +32,7 @@ requirements: {% for dep in build_deps %} - {{ dep }} {% endfor %} - - {{ compiler('c' }} - - flang - - libflang - - libllvm19 - - lld - - llvm-tools - - vs2022_win-64 + - compilers - charset-normalizer run: - python