From 701195b61e87d83be2062cf461360e2aba2c7088 Mon Sep 17 00:00:00 2001 From: dzalkind <65573423+dzalkind@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:48:31 -0600 Subject: [PATCH 1/2] Update README.md with proper OpenFAST version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d43d6e99..70d4c234f 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ WEIS integrates in a unique workflow four models: Software Model Versions: Software | Version --- | --- -OpenFAST | 3.4.0 +OpenFAST | 3.5.0 ROSCO | develop ([05d7b3b](https://github.com/NREL/ROSCO/commit/05d7b3b948c12ad40892941b6f92f3b08f5c6894)) WISDEM | develop ([6f15fc9](https://github.com/WISDEM/WISDEM/commit/6f15fc9ed7f7fd1282d32af5518d2ae37dbc9466)) From 6f9de4509c159c1e3c517e0d6a4ab8ac59a4909a Mon Sep 17 00:00:00 2001 From: Eliot Quon Date: Tue, 14 Nov 2023 13:49:48 -0700 Subject: [PATCH 2/2] Update setup (#235) * Update compiler flag for mac Tested with macosx-11.0-arm64-3.11 * smt package not found in conda-forge; moved to pip mamba 1.5.1 conda 23.7.4 --- environment.yml | 2 +- setup.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index c617eab96..f14dcac70 100644 --- a/environment.yml +++ b/environment.yml @@ -48,7 +48,6 @@ dependencies: - setuptools - simpy - slycot - - smt - sortedcontainers - sphinx - sphinxcontrib-applehelp @@ -66,6 +65,7 @@ dependencies: - dearpygui - marmot-agents - osqp + - smt # Needs to be done outside of environment file: # - m2w64-toolchain # [win] # - libpython # [win] diff --git a/setup.py b/setup.py index ee5a50e54..14c973e76 100644 --- a/setup.py +++ b/setup.py @@ -75,6 +75,10 @@ def build_extension(self, ext): elif (mycompiler.find('ifort') >= 0 or mycompiler.find('icc') >= 0 or mycompiler.find('icpc') >= 0): tune = '-xHost' + + elif platform.system() == 'Darwin': + # clang doesn't support -march=native + tune = '-mtune=native' else: tune = '-march=native -mtune=native'