From 589dd3497cca522a3db0173f0b36edbb486e6eab Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:03:35 -0800 Subject: [PATCH 1/8] update meson version for windows --- .github/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/environment.yml b/.github/environment.yml index 5883a678..7b853be1 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -4,7 +4,7 @@ dependencies: - numpy >=1.16 - ipopt - swig - - meson =0.61 + - meson >=1.3.1 - compilers - pkg-config - pip From 011e401bdd624e1f13d5274e893649e678156219 Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:21:38 -0800 Subject: [PATCH 2/8] try lld --- .github/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/environment.yml b/.github/environment.yml index 7b853be1..fbe8bf88 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -6,6 +6,7 @@ dependencies: - swig - meson >=1.3.1 - compilers + - lld - pkg-config - pip - setuptools From 3a403cab53e556ef20da80b34137482ea65ab0c2 Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:28:14 -0800 Subject: [PATCH 3/8] install flang --- .github/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/environment.yml b/.github/environment.yml index fbe8bf88..edf9a54d 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -5,7 +5,7 @@ dependencies: - ipopt - swig - meson >=1.3.1 - - compilers + - flang - lld - pkg-config - pip From f9379d86cb19fedf6bdd17e1548d804a5c2fc859 Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:35:58 -0800 Subject: [PATCH 4/8] also need clang --- .github/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/environment.yml b/.github/environment.yml index edf9a54d..48e647dc 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -5,6 +5,7 @@ dependencies: - ipopt - swig - meson >=1.3.1 + - clang - flang - lld - pkg-config From 84d491d1f8731b82a3150b30f11dce1bbca56d26 Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:41:34 -0800 Subject: [PATCH 5/8] back to compilers --- .github/environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/environment.yml b/.github/environment.yml index 48e647dc..19e35160 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -5,9 +5,8 @@ dependencies: - ipopt - swig - meson >=1.3.1 - - clang + - compilers - flang - - lld - pkg-config - pip - setuptools From 63991454a6fb2d6c889f55b163235237e020acfe Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:46:23 -0800 Subject: [PATCH 6/8] one more time --- .github/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/environment.yml b/.github/environment.yml index 19e35160..1b09bca6 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -7,6 +7,7 @@ dependencies: - meson >=1.3.1 - compilers - flang + - lld - pkg-config - pip - setuptools From 95f8869e3b71d4fc33167940a1941d675c8a88cc Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 10 Jan 2024 17:56:12 -0800 Subject: [PATCH 7/8] try default linker --- .github/windows.yaml | 1 - .github/workflows/windows-build.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/windows.yaml b/.github/windows.yaml index 4f600ccf..4e9f00d7 100644 --- a/.github/windows.yaml +++ b/.github/windows.yaml @@ -30,7 +30,6 @@ jobs: set IPOPT_DIR=%CONDA_PREFIX%\Library set CC=cl set FC=flang - set CC_LD=link python -m build -n -x . pip install --no-deps --no-index --find-links dist pyoptsparse displayName: Build and install pyoptsparse diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index c5123515..9189da5b 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -34,7 +34,6 @@ jobs: set IPOPT_DIR=%CONDA_PREFIX%\Library set CC=cl set FC=flang - set CC_LD=link python -m build -n -x . pip install --no-deps --no-index --find-links dist pyoptsparse - name: Run tests From cb1f6393f0f4ebd90534cac0d2536bcfd2716aa9 Mon Sep 17 00:00:00 2001 From: Ella Wu Date: Wed, 14 Feb 2024 16:42:59 -0800 Subject: [PATCH 8/8] update to new meson and revert changes --- .github/environment.yml | 6 ++---- .github/windows.yaml | 1 + .github/workflows/windows-build.yml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/environment.yml b/.github/environment.yml index 1b09bca6..2cac37e7 100644 --- a/.github/environment.yml +++ b/.github/environment.yml @@ -4,10 +4,8 @@ dependencies: - numpy >=1.16 - ipopt - swig - - meson >=1.3.1 + - meson >=1.3.2 - compilers - - flang - - lld - pkg-config - pip - setuptools @@ -17,4 +15,4 @@ dependencies: - testflo - scipy >1.2 - mdolab-baseclasses >=1.3.1 - - sqlitedict >=1.6 \ No newline at end of file + - sqlitedict >=1.6 diff --git a/.github/windows.yaml b/.github/windows.yaml index 4e9f00d7..4f600ccf 100644 --- a/.github/windows.yaml +++ b/.github/windows.yaml @@ -30,6 +30,7 @@ jobs: set IPOPT_DIR=%CONDA_PREFIX%\Library set CC=cl set FC=flang + set CC_LD=link python -m build -n -x . pip install --no-deps --no-index --find-links dist pyoptsparse displayName: Build and install pyoptsparse diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9189da5b..c5123515 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -34,6 +34,7 @@ jobs: set IPOPT_DIR=%CONDA_PREFIX%\Library set CC=cl set FC=flang + set CC_LD=link python -m build -n -x . pip install --no-deps --no-index --find-links dist pyoptsparse - name: Run tests