From 1d2eb0e5e3bb21372d91fb35ab29edad842b54a6 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Sun, 11 Jun 2023 17:30:56 -0700 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 8e1028ec6665ce191db2028bf9af5c6cc96fdb7c Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Fri, 23 Jun 2023 10:49:52 -0700 Subject: [PATCH 4/6] Update continuous_integration.yml Variants are baked into configuration files already no need to duplicate the builds for python versions --- .github/workflows/continuous_integration.yml | 162 ++----------------- 1 file changed, 14 insertions(+), 148 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 5cb4844..afa3e70 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -13,7 +13,7 @@ on: - master jobs: - windows310: + windows31011: runs-on: windows-latest steps: @@ -40,46 +40,19 @@ jobs: chdir $env:GITHUB_WORKSPACE conda build . - - name: upload artifact + - name: upload artifact 310 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 - - windows311: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v1 - - - name: Install Python packages - uses: actions/setup-python@v2 - with: - python-version: '3.11' - - name: Install numpy - #Need numpy to use SWIG numpy typemaps. - run: python -m pip install numpy==1.23 - - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - miniconda-version: "latest" - - name: Install conda-build - run: conda install conda-build - - - name: Conda build - run: | - chdir $env:GITHUB_WORKSPACE - conda build . - - - name: upload artifact + - name: upload artifact 311 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 - windows310-moco: + windows31011-moco: runs-on: windows-latest steps: @@ -106,46 +79,19 @@ jobs: chdir $env:GITHUB_WORKSPACE conda build opensim-moco - - name: upload artifact + - name: upload artifact 310-moco 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 - - windows311-moco: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v1 - - - name: Install Python packages - uses: actions/setup-python@v2 - with: - python-version: '3.11' - - name: Install numpy - #Need numpy to use SWIG numpy typemaps. - run: python -m pip install numpy==1.23 - - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - miniconda-version: "latest" - - name: Install conda-build - run: conda install conda-build - - - name: Conda build - run: | - chdir $env:GITHUB_WORKSPACE - conda build opensim-moco - - - name: upload artifact + - name: upload artifact 311-moco 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 - - ubuntu310: + + ubuntu31011: runs-on: ubuntu-20.04 steps: @@ -185,59 +131,19 @@ jobs: cd $GITHUB_WORKSPACE/opensim conda build . - - name: upload artifact + - name: upload artifact ubuntu310 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 - - ubuntu311: - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - python-version: '3.11' - channels: conda-forge,defaults - miniconda-version: "latest" - - - name: Install Python packages - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - - name: Install numpy - #Need numpy to use SWIG numpy typemaps. - 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 - - - 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 - sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache - make && make -j4 install - - - name: Install conda-build - run: conda install conda-build - - - name: Conda build - run: | - cd $GITHUB_WORKSPACE/opensim - conda build . - - name: upload artifact + - name: upload artifact ubuntu311 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 - - ubuntu310-moco: + + ubuntu31011-moco: runs-on: ubuntu-20.04 steps: @@ -277,53 +183,13 @@ jobs: cd $GITHUB_WORKSPACE/opensim-moco conda build . - - name: upload artifact + - name: upload artifact ubuntu310-moco 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 - - ubuntu311-moco: - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - python-version: '3.11' - channels: conda-forge,defaults - miniconda-version: "latest" - - - name: Install Python packages - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - - name: Install numpy - #Need numpy to use SWIG numpy typemaps. - 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 - - - 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 - sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache - make && make -j4 install - - - name: Install conda-build - run: conda install conda-build - - - name: Conda build - run: | - cd $GITHUB_WORKSPACE/opensim-moco - conda build . - - name: upload artifact + - name: upload artifact ubuntu311-moco uses: actions/upload-artifact@v2 with: name: linux64-opensim-moco-4.4-py311np123.tar.bz2 From 4d832d4011bf20e765564348636aab1317261904 Mon Sep 17 00:00:00 2001 From: Ayman Habib Date: Mon, 26 Jun 2023 21:36:12 -0700 Subject: [PATCH 5/6] Update continuous_integration.yml build either opensim or opensim-moco in one task to optimize runtime --- .github/workflows/continuous_integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index afa3e70..cd608df 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 opensim - name: upload artifact 310 uses: actions/upload-artifact@v2 @@ -129,7 +129,7 @@ jobs: - name: Conda build run: | cd $GITHUB_WORKSPACE/opensim - conda build . + conda build opensim - name: upload artifact ubuntu310 uses: actions/upload-artifact@v2 @@ -180,8 +180,8 @@ jobs: - name: Conda build run: | - cd $GITHUB_WORKSPACE/opensim-moco - conda build . + cd $GITHUB_WORKSPACE + conda build opensim-moco - name: upload artifact ubuntu310-moco uses: actions/upload-artifact@v2 From 58579a76084220bdbdcd38b7c2ef08b2e2b53c14 Mon Sep 17 00:00:00 2001 From: aymanhab Date: Wed, 12 Jul 2023 17:50:35 -0700 Subject: [PATCH 6/6] Use 441 branch, will likely have to change name of upload artifacts accordingly --- 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..cacdeea 100644 --- a/opensim-moco/meta.yaml +++ b/opensim-moco/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4" %} +{% set version = "4.4.1" %} 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: 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 951de43..7a843dd 100644 --- a/opensim/meta.yaml +++ b/opensim/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.4" %} +{% set version = "4.4.1" %} 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: branch_441 build: number: 2 # NOTE : For C++11 builds, vc16/VS 2019 are the only acceptable targets