From 1d2eb0e5e3bb21372d91fb35ab29edad842b54a6 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Sun, 11 Jun 2023 17:30:56 -0700 Subject: [PATCH 01/22] Add files for opensim-moco package --- opensim-moco/bld.bat | 41 +++++++++++++++++++++ opensim-moco/build.sh | 53 +++++++++++++++++++++++++++ opensim-moco/conda_build_config.yaml | 25 +++++++++++++ opensim-moco/meta.yaml | 54 ++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 opensim-moco/bld.bat create mode 100644 opensim-moco/build.sh create mode 100644 opensim-moco/conda_build_config.yaml create mode 100644 opensim-moco/meta.yaml diff --git a/opensim-moco/bld.bat b/opensim-moco/bld.bat new file mode 100644 index 0000000..90e0433 --- /dev/null +++ b/opensim-moco/bld.bat @@ -0,0 +1,41 @@ +mkdir opensim_dependencies_build +cd .\opensim_dependencies_build +cmake ..\dependencies^ + -G"Visual Studio 17 2022"^ + -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ + -DSUPERBUILD_ezc3d=ON^ + -DOPENSIM_WITH_TROPTER=ON^ + -DOPENSIM_WITH_CASADI=ON + +cmake --build . --config Release -- /maxcpucount:8 +cd .. +mkdir opensim_build +cd .\opensim_build +cmake ..\^ + -G"Visual Studio 17 2022"^ + -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^ + -DOPENSIM_DEPENDENCIES_DIR="%LIBRARY_PREFIX%"^ + -DCMAKE_INSTALL_INCLUDEDIR="%LIBRARY_PREFIX%/include"^ + -DCMAKE_INSTALL_LIBDIR="%LIBRARY_PREFIX%/lib"^ + -DCMAKE_INSTALL_DOCDIR="%LIBRARY_PREFIX%/doc"^ + -DCMAKE_INSTALL_SYSCONFDIR="%LIBRARY_PREFIX%/Library"^ + -DOPENSIM_INSTALL_PYTHONDIR="%LIBRARY_PREFIX%/Lib/site-packages"^ + -DOPENSIM_INSTALL_SIMBODYDIR="%LIBRARY_PREFIX%/Library/Simbody"^ + -DOPENSIM_INSTALL_SPDLOGDIR="%LIBRARY_PREFIX%/Library/spdlog"^ + -DOPENSIM_INSTALL_CASADIDIR="%LIBRARY_PREFIX%/Library"^ + -DBUILD_PYTHON_WRAPPING=ON^ + -DOPENSIM_C3D_PARSER=ezc3d^ + -DOPENSIM_PYTHON_STANDALONE=ON^ + -DOPENSIM_WITH_CASADI=ON^ + -DOPENSIM_WITH_TROPTER=ON^ + -DBUILD_TESTING=OFF^ + -DBUILD_API_EXAMPLES=OFF^ + -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^ + -DOPENSIM_PYTHON_CONDA=ON +cmake --build . --target install --config Release -- /maxcpucount:8 + +Rem move Library\sdk\Python Lib +move %LIBRARY_PREFIX%\sdk\Python %LIBRARY_PREFIX%\..\Lib +cd %LIBRARY_PREFIX%\..\Lib +python setup.py install + diff --git a/opensim-moco/build.sh b/opensim-moco/build.sh new file mode 100644 index 0000000..a14f9d3 --- /dev/null +++ b/opensim-moco/build.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# TODO: Dependencies should be separate packages... +mkdir opensim_dependencies_build +cd opensim_dependencies_build +cmake ../dependencies/ -LAH \ + -DCMAKE_INSTALL_PREFIX="$PREFIX" \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ + -DSUPERBUILD_docopt=ON \ + -DSUPERBUILD_simbody=ON \ + -DSUPERBUILD_spdlog=ON \ + -DSUPERBUILD_ezc3d=ON \ + -DOPENSIM_WITH_TROPTER=OFF \ + -DOPENSIM_WITH_CASADI=OFF + +make -j8 +cd .. + +# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ + +if [ "$(uname)" == "Darwin" ]; then + SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2 +else + SWIG_DIR_SPEC=~/swig/share/swig +fi +# TODO: Tests are missing! +mkdir opensim_build +cd opensim_build +cmake ../ \ + -DCMAKE_INSTALL_PREFIX="$PREFIX" \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENSIM_DEPENDENCIES_DIR="$PREFIX" \ + -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ + -DSWIG_DIR=${SWIG_DIR_SPEC} \ + -DSWIG_EXECUTABLE=~/swig/bin/swig \ + -DBUILD_PYTHON_WRAPPING=ON \ + -DOPENSIM_DISABLE_LOG_FILE=ON \ + -DOPENSIM_C3D_PARSER=ezc3d \ + -DOPENSIM_PYTHON_STANDALONE=ON \ + -DOPENSIM_INSTALL_UNIX_FHS=ON \ + -DBUILD_API_ONLY=OFF \ + -DBUILD_API_EXAMPLES=OFF \ + -DBUILD_TESTING=OFF \ + -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON \ + -DOPENSIM_COPY_DEPENDENCIES=ON \ + -DOPENSIM_WITH_TROPTER=OFF \ + -DOPENSIM_WITH_CASADI=OFF +make -j8 +make install diff --git a/opensim-moco/conda_build_config.yaml b/opensim-moco/conda_build_config.yaml new file mode 100644 index 0000000..3462e25 --- /dev/null +++ b/opensim-moco/conda_build_config.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: '10.10' +python: + - 3.10 + - 3.11 +numpy: + - 1.21 + - 1.23 +zip_keys: + - python + - numpy +c_compiler: + - vs2019 # [win] + - clang # [osx] + - gcc # [linux] +cxx_compiler: + - vs2019 # [win] + - clangxx # [osx] + - gxx # [linux] +c_compiler_version: + - 7.5.0 # [linux] +cxx_compiler_version: + - 7.5.0 # [linux] +CONDA_BUILD_SYSROOT: + /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk + diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml new file mode 100644 index 0000000..3458ea6 --- /dev/null +++ b/opensim-moco/meta.yaml @@ -0,0 +1,54 @@ +{% set version = "4.4" %} + +package: + name: opensim-moco + version: {{ version }} + +source: + git_url: https://github.com/opensim-org/opensim-core.git + git_rev: branch_4.4_conda +build: + number: 2 + # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets + features: + - vc16 # [win and py39] + # NOTE : This is needed to ensure the paths to Simbody's binaries, like + # simbody-visualizer, are corrected. + detect_binary_files_with_prefix: true + string: py{{ CONDA_PY }}np{{ CONDA_NPY }} +requirements: + host: + - openblas # [not win] + build: + - toolchain 2.4.0 0 # [win] + #- wheel 0.36.2 pyhd3eb1b0_0 + - swig 4.0.2 + - cmake >=3.15,<3.25 + - numpy {{ numpy }} + - python {{ python }} + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - openblas # [not win] + - make # [not win] + + run: + - numpy {{ numpy }} + - python {{ python }} + - freeglut # [win] + - openblas # [not win] + +test: + # imports: + # - opensim + +about: + home: http://opensim.stanford.edu + license: Apache-2.0 + summary: > + OpenSim is software that lets users develop models of musculoskeletal + structures and create dynamic simulations of movement. + +extra: + recipe-maintainers: + - aymanhab + - kidzik From df4b99b20802b86a2d4f1ca8cd6ca77ef7acfb9f Mon Sep 17 00:00:00 2001 From: aymanhab Date: Sun, 11 Jun 2023 17:32:40 -0700 Subject: [PATCH 02/22] Fix unix build script --- opensim-moco/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opensim-moco/build.sh b/opensim-moco/build.sh index a14f9d3..a4a61e4 100644 --- a/opensim-moco/build.sh +++ b/opensim-moco/build.sh @@ -12,8 +12,8 @@ cmake ../dependencies/ -LAH \ -DSUPERBUILD_simbody=ON \ -DSUPERBUILD_spdlog=ON \ -DSUPERBUILD_ezc3d=ON \ - -DOPENSIM_WITH_TROPTER=OFF \ - -DOPENSIM_WITH_CASADI=OFF + -DOPENSIM_WITH_TROPTER=ON \ + -DOPENSIM_WITH_CASADI=ON make -j8 cd .. @@ -47,7 +47,7 @@ cmake ../ \ -DBUILD_TESTING=OFF \ -DOPENSIM_BUILD_INDIVIDUAL_APPS=ON \ -DOPENSIM_COPY_DEPENDENCIES=ON \ - -DOPENSIM_WITH_TROPTER=OFF \ - -DOPENSIM_WITH_CASADI=OFF + -DOPENSIM_WITH_TROPTER=ON \ + -DOPENSIM_WITH_CASADI=ON make -j8 make install From 27d5723db81b9d78f0de28a08d3ebc5c119e7649 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Sun, 11 Jun 2023 22:39:55 -0700 Subject: [PATCH 03/22] Add moco builds to ci on windows, linux --- .github/workflows/continuous_integration.yml | 84 +++++++++++--------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 3ef01a6..5cb4844 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -12,7 +12,8 @@ on: branches: - master jobs: - windows38: + + windows310: runs-on: windows-latest steps: @@ -21,11 +22,11 @@ jobs: - name: Install Python packages uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - name: Install numpy #Need numpy to use SWIG numpy typemaps. - run: python -m pip install numpy==1.20 + run: python -m pip install numpy==1.21.4 - uses: conda-incubator/setup-miniconda@v2 with: @@ -42,9 +43,10 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py38np120.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py38np120.tar.bz2 - windows39: + name: win64-opensim-4.4-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py310np121.tar.bz2 + + windows311: runs-on: windows-latest steps: @@ -53,11 +55,11 @@ jobs: - name: Install Python packages uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: '3.11' - name: Install numpy #Need numpy to use SWIG numpy typemaps. - run: python -m pip install numpy==1.20 + run: python -m pip install numpy==1.23 - uses: conda-incubator/setup-miniconda@v2 with: @@ -74,10 +76,10 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py39np120.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py39np120.tar.bz2 + name: win64-opensim-4.4-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py311np123.tar.bz2 - windows310: + windows310-moco: runs-on: windows-latest steps: @@ -102,15 +104,15 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build . + conda build opensim-moco - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py310np121.tar.bz2 + name: win64-opensim-moco-4.4-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py310np121.tar.bz2 - windows311: + windows311-moco: runs-on: windows-latest steps: @@ -135,15 +137,15 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build . + conda build opensim-moco - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py311np123.tar.bz2 + name: win64-opensim-moco-4.4-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py311np123.tar.bz2 - ubuntu38: + ubuntu310: runs-on: ubuntu-20.04 steps: @@ -151,17 +153,21 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - python-version: 3.8 + python-version: '3.10' channels: conda-forge,defaults miniconda-version: "latest" - name: Install Python packages uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' + - name: Install numpy + #Need numpy to use SWIG numpy typemaps. + run: python3 -m pip install numpy==1.21 + - name: Install packages - run: sudo apt-get update && sudo apt-get install --yes build-essential libtool autoconf pkg-config gfortran libopenblas-dev liblapack-dev freeglut3-dev libxi-dev libxmu-dev doxygen python3.8 python3-dev python3-numpy python3-setuptools + run: sudo apt-get update && sudo apt-get install --yes build-essential libtool autoconf pkg-config gfortran libopenblas-dev liblapack-dev freeglut3-dev libxi-dev libxmu-dev doxygen python3 python3-dev python3-numpy python3-setuptools - name: Install SWIG run: | @@ -182,9 +188,10 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py38np120.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py38np120.tar.bz2 - ubuntu39: + name: linux64-opensim-4.4-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py310np121.tar.bz2 + + ubuntu311: runs-on: ubuntu-20.04 steps: @@ -192,18 +199,18 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - python-version: 3.9 + python-version: '3.11' channels: conda-forge,defaults miniconda-version: "latest" - name: Install Python packages uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.11' - name: Install numpy #Need numpy to use SWIG numpy typemaps. - run: python3 -m pip install numpy==1.20.2 + run: python3 -m pip install numpy==1.23 - name: Install packages run: sudo apt-get update && sudo apt-get install --yes build-essential libtool autoconf pkg-config gfortran libopenblas-dev liblapack-dev freeglut3-dev libxi-dev libxmu-dev doxygen python3 python3-dev python3-numpy python3-setuptools @@ -227,9 +234,10 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py39np120.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py39np120.tar.bz2 - ubuntu310: + name: linux64-opensim-4.4-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py311np123.tar.bz2 + + ubuntu310-moco: runs-on: ubuntu-20.04 steps: @@ -266,16 +274,16 @@ jobs: - name: Conda build run: | - cd $GITHUB_WORKSPACE/opensim + cd $GITHUB_WORKSPACE/opensim-moco conda build . - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py310np121.tar.bz2 + name: linux64-opensim-moco-4.4-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py310np121.tar.bz2 - ubuntu311: + ubuntu311-moco: runs-on: ubuntu-20.04 steps: @@ -312,14 +320,14 @@ jobs: - name: Conda build run: | - cd $GITHUB_WORKSPACE/opensim + cd $GITHUB_WORKSPACE/opensim-moco conda build . - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py311np123.tar.bz2 + name: linux64-opensim-moco-4.4-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py311np123.tar.bz2 style: name: Style From e8b21d1cf38df6204b5640e7fe5e23d219bc0114 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 12 Jun 2023 08:47:19 -0700 Subject: [PATCH 04/22] builds based on main branch --- opensim-moco/meta.yaml | 4 ++-- opensim/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index 3458ea6..83baad4 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4" %} +{% set version = "4.5" %} package: name: opensim-moco @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_4.4_conda + git_rev: main build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 951de43..1de2488 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4" %} +{% set version = "4.5" %} package: name: opensim @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_4.4_conda + git_rev: main build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets From 747a2fe9d5b51c0faf5775af3dd0a1a26522d1aa Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 14 Jun 2023 11:08:37 -0700 Subject: [PATCH 05/22] Update continuous_integration.yml Fix name of artifact to 4.5 --- .github/workflows/continuous_integration.yml | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 5cb4844..e51e414 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -43,8 +43,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py310np121.tar.bz2 + name: win64-opensim-4.5-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py310np121.tar.bz2 windows311: runs-on: windows-latest @@ -76,8 +76,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py311np123.tar.bz2 + name: win64-opensim-4.5-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py311np123.tar.bz2 windows310-moco: runs-on: windows-latest @@ -109,8 +109,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.4-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py310np121.tar.bz2 + name: win64-opensim-moco-4.5-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py310np121.tar.bz2 windows311-moco: runs-on: windows-latest @@ -142,8 +142,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.4-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4-py311np123.tar.bz2 + name: win64-opensim-moco-4.5-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py311np123.tar.bz2 ubuntu310: runs-on: ubuntu-20.04 @@ -188,8 +188,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py310np121.tar.bz2 + name: linux64-opensim-4.5-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py310np121.tar.bz2 ubuntu311: runs-on: ubuntu-20.04 @@ -234,8 +234,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py311np123.tar.bz2 + name: linux64-opensim-4.5-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py311np123.tar.bz2 ubuntu310-moco: runs-on: ubuntu-20.04 @@ -280,8 +280,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.4-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py310np121.tar.bz2 + name: linux64-opensim-moco-4.5-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py310np121.tar.bz2 ubuntu311-moco: runs-on: ubuntu-20.04 @@ -326,8 +326,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.4-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4-py311np123.tar.bz2 + name: linux64-opensim-moco-4.5-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py311np123.tar.bz2 style: name: Style From 4d5418f8d7bdd9ebdb2cc581f87d2fc9da139afe Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 12 Jul 2023 20:13:26 -0700 Subject: [PATCH 06/22] Switch to branch 441 --- opensim-moco/meta.yaml | 2 +- opensim/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index 83baad4..98ce25c 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: main + git_rev: branch_441 build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 1de2488..0109303 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: main + git_rev: branch_441 build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets From 1db24479b6f498b6378465f42b6f4c5fcca35f04 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Fri, 14 Jul 2023 11:58:41 -0700 Subject: [PATCH 07/22] fix branch name and build number --- opensim-moco/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index 98ce25c..082ec08 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.5" %} +{% set version = "4.4.1" %} package: name: opensim-moco @@ -6,9 +6,9 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_441 + git_rev: branch_4.4.1 build: - number: 2 + number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - vc16 # [win and py39] From b7efa1e5b0bb81f6e696e9a3dcca04aa0a6583b6 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Fri, 14 Jul 2023 12:01:19 -0700 Subject: [PATCH 08/22] fix branch name and build number for 4.4.1 --- opensim/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 0109303..1cacf54 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.5" %} +{% set version = "4.4.1" %} package: name: opensim @@ -6,9 +6,9 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_441 + git_rev: branch_4.4.1 build: - number: 2 + number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets features: - vc16 # [win and py39] From 2a68a0293f751fff5b105ca205bdd982e8d91729 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Tue, 18 Jul 2023 12:00:39 -0700 Subject: [PATCH 09/22] Add python 3.9, np 120 variant --- opensim-moco/conda_build_config.yaml | 2 ++ opensim/conda_build_config.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/opensim-moco/conda_build_config.yaml b/opensim-moco/conda_build_config.yaml index 3462e25..43c753b 100644 --- a/opensim-moco/conda_build_config.yaml +++ b/opensim-moco/conda_build_config.yaml @@ -1,8 +1,10 @@ MACOSX_DEPLOYMENT_TARGET: '10.10' python: + - 3.9 - 3.10 - 3.11 numpy: + - 1.20 - 1.21 - 1.23 zip_keys: diff --git a/opensim/conda_build_config.yaml b/opensim/conda_build_config.yaml index 3462e25..43c753b 100644 --- a/opensim/conda_build_config.yaml +++ b/opensim/conda_build_config.yaml @@ -1,8 +1,10 @@ MACOSX_DEPLOYMENT_TARGET: '10.10' python: + - 3.9 - 3.10 - 3.11 numpy: + - 1.20 - 1.21 - 1.23 zip_keys: From a71071dca8846b04626ed8bc3ee70807b9f602a2 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Thu, 20 Jul 2023 13:45:32 -0700 Subject: [PATCH 10/22] Run test after build and add in python 3.9, numpy 1.20 pair --- opensim-moco/conda_build_config.yaml | 6 +++--- opensim-moco/meta.yaml | 4 ++-- opensim/meta.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opensim-moco/conda_build_config.yaml b/opensim-moco/conda_build_config.yaml index 43c753b..c9675b6 100644 --- a/opensim-moco/conda_build_config.yaml +++ b/opensim-moco/conda_build_config.yaml @@ -1,8 +1,8 @@ MACOSX_DEPLOYMENT_TARGET: '10.10' python: - - 3.9 - - 3.10 - - 3.11 + - 3.9 + - 3.10 + - 3.11 numpy: - 1.20 - 1.21 diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index 082ec08..e075659 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -38,8 +38,8 @@ requirements: - openblas # [not win] test: - # imports: - # - opensim + imports: + - opensim about: home: http://opensim.stanford.edu diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 1cacf54..86cf279 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -38,8 +38,8 @@ requirements: - openblas # [not win] test: - # imports: - # - opensim + imports: + - opensim about: home: http://opensim.stanford.edu From d3accbda1bac6288520b5f3b250cf6be172a2a46 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Thu, 20 Jul 2023 15:01:28 -0700 Subject: [PATCH 11/22] Update continuous_integration.yml specify python version on conda build command line to avoid excessive redundant builds --- .github/workflows/continuous_integration.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index e51e414..5afa429 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -38,7 +38,7 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build . + conda build . --python=3.10 - name: upload artifact uses: actions/upload-artifact@v2 @@ -71,7 +71,7 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build . + conda build . --python=3.11 - name: upload artifact uses: actions/upload-artifact@v2 @@ -104,7 +104,7 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build opensim-moco + conda build opensim-moco --python=3.10 - name: upload artifact uses: actions/upload-artifact@v2 @@ -137,7 +137,7 @@ jobs: - name: Conda build run: | chdir $env:GITHUB_WORKSPACE - conda build opensim-moco + conda build opensim-moco --python=3.11 - name: upload artifact uses: actions/upload-artifact@v2 @@ -183,7 +183,7 @@ jobs: - name: Conda build run: | cd $GITHUB_WORKSPACE/opensim - conda build . + conda build . --python=3.10 - name: upload artifact uses: actions/upload-artifact@v2 @@ -229,7 +229,7 @@ jobs: - name: Conda build run: | cd $GITHUB_WORKSPACE/opensim - conda build . + conda build . --python=3.11 - name: upload artifact uses: actions/upload-artifact@v2 @@ -275,7 +275,7 @@ jobs: - name: Conda build run: | cd $GITHUB_WORKSPACE/opensim-moco - conda build . + conda build . --python=3.10 - name: upload artifact uses: actions/upload-artifact@v2 @@ -321,7 +321,7 @@ jobs: - name: Conda build run: | cd $GITHUB_WORKSPACE/opensim-moco - conda build . + conda build . --python=3.11 - name: upload artifact uses: actions/upload-artifact@v2 From d520cefa31bf177fc840b08906bc537d59a1b076 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 1 Nov 2023 17:11:02 -0700 Subject: [PATCH 12/22] try building latest main branch and copy simbody-visualizer on *nix --- opensim-moco/build.sh | 2 +- opensim-moco/meta.yaml | 6 +++--- opensim/build.sh | 2 +- opensim/meta.yaml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opensim-moco/build.sh b/opensim-moco/build.sh index a4a61e4..39ff9cd 100644 --- a/opensim-moco/build.sh +++ b/opensim-moco/build.sh @@ -18,7 +18,7 @@ cmake ../dependencies/ -LAH \ make -j8 cd .. -# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ +cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ if [ "$(uname)" == "Darwin" ]; then SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2 diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index e075659..c509776 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4.1" %} +{% set version = "4.4.9" %} package: name: opensim-moco @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_4.4.1 + git_rev: main build: number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets @@ -22,7 +22,7 @@ requirements: build: - toolchain 2.4.0 0 # [win] #- wheel 0.36.2 pyhd3eb1b0_0 - - swig 4.0.2 + - swig 4.4.1 - cmake >=3.15,<3.25 - numpy {{ numpy }} - python {{ python }} diff --git a/opensim/build.sh b/opensim/build.sh index a14f9d3..2e0e10b 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -18,7 +18,7 @@ cmake ../dependencies/ -LAH \ make -j8 cd .. -# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ +cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ if [ "$(uname)" == "Darwin" ]; then SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2 diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 86cf279..8cd5c14 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4.1" %} +{% set version = "4.4.9" %} package: name: opensim @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: branch_4.4.1 + git_rev: main build: number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets @@ -22,7 +22,7 @@ requirements: build: - toolchain 2.4.0 0 # [win] #- wheel 0.36.2 pyhd3eb1b0_0 - - swig 4.0.2 + - swig 4.1.1 - cmake >=3.15,<3.25 - numpy {{ numpy }} - python {{ python }} From 03f7a09578e604c79ce06ab2facd4c9b7f0ad311 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 1 Nov 2023 17:14:51 -0700 Subject: [PATCH 13/22] update ci to match versions in other config files --- .github/workflows/continuous_integration.yml | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 5afa429..02145a0 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -43,8 +43,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.5-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py310np121.tar.bz2 + name: win64-opensim-4.4.9-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4.9-py310np121.tar.bz2 windows311: runs-on: windows-latest @@ -76,8 +76,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.5-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py311np123.tar.bz2 + name: win64-opensim-4.4.9-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4.9-py311np123.tar.bz2 windows310-moco: runs-on: windows-latest @@ -109,8 +109,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.5-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py310np121.tar.bz2 + name: win64-opensim-moco-4.4.9-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4.9-py310np121.tar.bz2 windows311-moco: runs-on: windows-latest @@ -142,8 +142,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.5-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py311np123.tar.bz2 + name: win64-opensim-moco-4.4.9-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4.9-py311np123.tar.bz2 ubuntu310: runs-on: ubuntu-20.04 @@ -172,8 +172,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -188,8 +188,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.5-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py310np121.tar.bz2 + name: linux64-opensim-4.4.9-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4.9-py310np121.tar.bz2 ubuntu311: runs-on: ubuntu-20.04 @@ -218,8 +218,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -234,8 +234,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.5-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py311np123.tar.bz2 + name: linux64-opensim-4.4.9-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4.9-py311np123.tar.bz2 ubuntu310-moco: runs-on: ubuntu-20.04 @@ -264,8 +264,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -280,8 +280,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.5-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py310np121.tar.bz2 + name: linux64-opensim-moco-4.4.9-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4.9-py310np121.tar.bz2 ubuntu311-moco: runs-on: ubuntu-20.04 @@ -310,8 +310,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz - tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz + tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -326,8 +326,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.5-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py311np123.tar.bz2 + name: linux64-opensim-moco-4.4.9-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4.9-py311np123.tar.bz2 style: name: Style From 905f0992a133d9157c24fda92f0fa856d2362d00 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 1 Nov 2023 17:19:59 -0700 Subject: [PATCH 14/22] Update continuous_integration.yml fire build --- .github/workflows/continuous_integration.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 02145a0..1bf811f 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -3,14 +3,13 @@ name: continuous-integration # syntax https://help.github.com/en/articles/workflow-syntax-for-github-actions on: # Run at 2am every night. - schedule: - - cron: '0 2 * * *' pull_request: branches: - '*' push: branches: - master + jobs: windows310: From ed01f793642ac64da4c05ac19e5924c16f7d45d6 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Wed, 1 Nov 2023 17:24:53 -0700 Subject: [PATCH 15/22] Update continuous_integration.yml --- .github/workflows/continuous_integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 1bf811f..68236c0 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -2,7 +2,6 @@ name: continuous-integration # syntax https://help.github.com/en/articles/workflow-syntax-for-github-actions on: - # Run at 2am every night. pull_request: branches: - '*' From db90607ae1d2da00d804c14f4fad18cc823622fa Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 1 Nov 2023 18:30:23 -0700 Subject: [PATCH 16/22] Revert to swig 4.0.2 --- .github/workflows/continuous_integration.yml | 16 ++++++++-------- opensim-moco/meta.yaml | 2 +- opensim/meta.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 02145a0..0b0f345 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -172,8 +172,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz + tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -218,8 +218,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz + tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -264,8 +264,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz + tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install @@ -310,8 +310,8 @@ jobs: - name: Install SWIG run: | mkdir ~/swig-source && cd ~/swig-source - wget https://github.com/swig/swig/archive/refs/tags/rel-4.1.1.tar.gz - tar xzf rel-4.1.1.tar.gz && cd swig-rel-4.1.1 + wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz + tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2 sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache make && make -j4 install diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index c509776..b0ae5f1 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -22,7 +22,7 @@ requirements: build: - toolchain 2.4.0 0 # [win] #- wheel 0.36.2 pyhd3eb1b0_0 - - swig 4.4.1 + - swig 4.0.2 - cmake >=3.15,<3.25 - numpy {{ numpy }} - python {{ python }} diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 8cd5c14..48f276c 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -22,7 +22,7 @@ requirements: build: - toolchain 2.4.0 0 # [win] #- wheel 0.36.2 pyhd3eb1b0_0 - - swig 4.1.1 + - swig 4.0.2 - cmake >=3.15,<3.25 - numpy {{ numpy }} - python {{ python }} From 5c8a3a728ae9c05bf8561b5a8f13ae41b20e1abe Mon Sep 17 00:00:00 2001 From: aymanhab Date: Mon, 20 Nov 2023 18:47:33 -0800 Subject: [PATCH 17/22] Use version 4.5 --- opensim-moco/meta.yaml | 2 +- opensim/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index b0ae5f1..72ce1a6 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4.9" %} +{% set version = "4.5" %} package: name: opensim-moco diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 48f276c..1dbcf8a 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4.9" %} +{% set version = "4.5" %} package: name: opensim From ab76d7b05ffe64612ebda397b6a8b04bd9047f68 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 29 Nov 2023 13:29:34 -0800 Subject: [PATCH 18/22] use opensim_45 branch --- opensim-moco/meta.yaml | 2 +- opensim/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensim-moco/meta.yaml b/opensim-moco/meta.yaml index 72ce1a6..a9e19ae 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: main + git_rev: opensim_45 build: number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets diff --git a/opensim/meta.yaml b/opensim/meta.yaml index 1dbcf8a..f990729 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/opensim-org/opensim-core.git - git_rev: main + git_rev: opensim_45 build: number: 1 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets From 2cdee1d6e5d8664de8fcb3fffb8ca2faa1ac75a4 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 1 Dec 2023 11:26:03 -0800 Subject: [PATCH 19/22] Update continuous_integration.yml use 4.5 for artifacts --- .github/workflows/continuous_integration.yml | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 542b3c1..58621ea 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -41,8 +41,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4.9-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4.9-py310np121.tar.bz2 + name: win64-opensim-4.5-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py310np121.tar.bz2 windows311: runs-on: windows-latest @@ -74,8 +74,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-4.4.9-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4.9-py311np123.tar.bz2 + name: win64-opensim-4.5-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.5-py311np123.tar.bz2 windows310-moco: runs-on: windows-latest @@ -107,8 +107,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.4.9-py310np121.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4.9-py310np121.tar.bz2 + name: win64-opensim-moco-4.5-py310np121.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py310np121.tar.bz2 windows311-moco: runs-on: windows-latest @@ -140,8 +140,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: win64-opensim-moco-4.4.9-py311np123.tar.bz2 - path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.4.9-py311np123.tar.bz2 + name: win64-opensim-moco-4.5-py311np123.tar.bz2 + path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-moco-4.5-py311np123.tar.bz2 ubuntu310: runs-on: ubuntu-20.04 @@ -186,8 +186,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4.9-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4.9-py310np121.tar.bz2 + name: linux64-opensim-4.5-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py310np121.tar.bz2 ubuntu311: runs-on: ubuntu-20.04 @@ -232,8 +232,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-4.4.9-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4.9-py311np123.tar.bz2 + name: linux64-opensim-4.5-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5-py311np123.tar.bz2 ubuntu310-moco: runs-on: ubuntu-20.04 @@ -278,8 +278,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.4.9-py310np121.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4.9-py310np121.tar.bz2 + name: linux64-opensim-moco-4.5-py310np121.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py310np121.tar.bz2 ubuntu311-moco: runs-on: ubuntu-20.04 @@ -324,8 +324,8 @@ jobs: - name: upload artifact uses: actions/upload-artifact@v2 with: - name: linux64-opensim-moco-4.4.9-py311np123.tar.bz2 - path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.4.9-py311np123.tar.bz2 + name: linux64-opensim-moco-4.5-py311np123.tar.bz2 + path: /usr/share/miniconda3/conda-bld/linux-64/opensim-moco-4.5-py311np123.tar.bz2 style: name: Style From a85691af16a336407c9eebab3a6c61a9c58f4b1d Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 1 Dec 2023 23:06:20 -0800 Subject: [PATCH 20/22] Update build.sh no simbody visualizer build/copy for now --- opensim-moco/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim-moco/build.sh b/opensim-moco/build.sh index 39ff9cd..a4a61e4 100644 --- a/opensim-moco/build.sh +++ b/opensim-moco/build.sh @@ -18,7 +18,7 @@ cmake ../dependencies/ -LAH \ make -j8 cd .. -cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ +# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ if [ "$(uname)" == "Darwin" ]; then SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2 From 58da1296b37a55d88566f276dfe10b4e2e0b02df Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 1 Dec 2023 23:07:08 -0800 Subject: [PATCH 21/22] Update build.sh no visualizer for now --- opensim/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensim/build.sh b/opensim/build.sh index 2e0e10b..a14f9d3 100644 --- a/opensim/build.sh +++ b/opensim/build.sh @@ -18,7 +18,7 @@ cmake ../dependencies/ -LAH \ make -j8 cd .. -cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ +# cp -r $PREFIX/simbody/libexec/simbody/* $PREFIX/bin/ if [ "$(uname)" == "Darwin" ]; then SWIG_DIR_SPEC=/usr/local/Cellar/swig/4.0.2 From 52b45c11cf7a094290628624c53afead4d605867 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Sat, 2 Dec 2023 00:28:29 -0800 Subject: [PATCH 22/22] Update continuous_integration.yml Separate non-moco builds on windows --- .github/workflows/continuous_integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 58621ea..9825ba3 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -35,7 +35,7 @@ jobs: - name: Conda build run: | - chdir $env:GITHUB_WORKSPACE + chdir $env:GITHUB_WORKSPACE/opensim conda build . --python=3.10 - name: upload artifact @@ -68,7 +68,7 @@ jobs: - name: Conda build run: | - chdir $env:GITHUB_WORKSPACE + chdir $env:GITHUB_WORKSPACE/opensim conda build . --python=3.11 - name: upload artifact