Skip to content

Commit b443051

Browse files
aymanhabaymanhab
authored
Merge pull request #39 from opensim-org/update_46
Update main/master branch to build bleeding edge from opensim-core
2 parents dc55086 + f12d191 commit b443051

File tree

7 files changed

+32
-330
lines changed

7 files changed

+32
-330
lines changed

‎.github/workflows/continuous_integration.yml‎

Lines changed: 8 additions & 273 deletions
Original file line numberDiff line numberDiff line change
@@ -2,238 +2,19 @@ name: continuous-integration
22

33
# syntax https://help.github.com/en/articles/workflow-syntax-for-github-actions
44
on:
5-
# Run at 2am every night.
6-
schedule:
7-
- cron: '0 2 * * *'
85
pull_request:
96
branches:
107
- '*'
118
push:
129
branches:
1310
- master
14-
jobs:
15-
windows38:
16-
runs-on: windows-latest
17-
18-
steps:
19-
- uses: actions/checkout@v1
20-
21-
- name: Install Python packages
22-
uses: actions/setup-python@v2
23-
with:
24-
python-version: '3.8'
25-
26-
- name: Install numpy
27-
#Need numpy to use SWIG numpy typemaps.
28-
run: python -m pip install numpy==1.20
29-
30-
- uses: conda-incubator/setup-miniconda@v2
31-
with:
32-
auto-update-conda: true
33-
miniconda-version: "latest"
34-
- name: Install conda-build
35-
run: conda install conda-build
36-
37-
- name: Conda build
38-
run: |
39-
chdir $env:GITHUB_WORKSPACE
40-
conda build .
41-
42-
- name: upload artifact
43-
uses: actions/upload-artifact@v2
44-
with:
45-
name: win64-opensim-4.4-py38np120.tar.bz2
46-
path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py38np120.tar.bz2
47-
windows39:
48-
runs-on: windows-latest
49-
50-
steps:
51-
- uses: actions/checkout@v1
52-
53-
- name: Install Python packages
54-
uses: actions/setup-python@v2
55-
with:
56-
python-version: '3.9'
57-
58-
- name: Install numpy
59-
#Need numpy to use SWIG numpy typemaps.
60-
run: python -m pip install numpy==1.20
61-
62-
- uses: conda-incubator/setup-miniconda@v2
63-
with:
64-
auto-update-conda: true
65-
miniconda-version: "latest"
66-
- name: Install conda-build
67-
run: conda install conda-build
68-
69-
- name: Conda build
70-
run: |
71-
chdir $env:GITHUB_WORKSPACE
72-
conda build .
73-
74-
- name: upload artifact
75-
uses: actions/upload-artifact@v2
76-
with:
77-
name: win64-opensim-4.4-py39np120.tar.bz2
78-
path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py39np120.tar.bz2
79-
80-
windows310:
81-
runs-on: windows-latest
82-
83-
steps:
84-
- uses: actions/checkout@v1
85-
86-
- name: Install Python packages
87-
uses: actions/setup-python@v2
88-
with:
89-
python-version: '3.10'
90-
91-
- name: Install numpy
92-
#Need numpy to use SWIG numpy typemaps.
93-
run: python -m pip install numpy==1.21.4
94-
95-
- uses: conda-incubator/setup-miniconda@v2
96-
with:
97-
auto-update-conda: true
98-
miniconda-version: "latest"
99-
- name: Install conda-build
100-
run: conda install conda-build
101-
102-
- name: Conda build
103-
run: |
104-
chdir $env:GITHUB_WORKSPACE
105-
conda build .
106-
107-
- name: upload artifact
108-
uses: actions/upload-artifact@v2
109-
with:
110-
name: win64-opensim-4.4-py310np121.tar.bz2
111-
path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py310np121.tar.bz2
112-
113-
windows311:
114-
runs-on: windows-latest
115-
116-
steps:
117-
- uses: actions/checkout@v1
118-
119-
- name: Install Python packages
120-
uses: actions/setup-python@v2
121-
with:
122-
python-version: '3.11'
123-
124-
- name: Install numpy
125-
#Need numpy to use SWIG numpy typemaps.
126-
run: python -m pip install numpy==1.23
127-
128-
- uses: conda-incubator/setup-miniconda@v2
129-
with:
130-
auto-update-conda: true
131-
miniconda-version: "latest"
132-
- name: Install conda-build
133-
run: conda install conda-build
134-
135-
- name: Conda build
136-
run: |
137-
chdir $env:GITHUB_WORKSPACE
138-
conda build .
139-
140-
- name: upload artifact
141-
uses: actions/upload-artifact@v2
142-
with:
143-
name: win64-opensim-4.4-py311np123.tar.bz2
144-
path: C:/Miniconda3/envs/test/conda-bld/win-64/opensim-4.4-py311np123.tar.bz2
145-
146-
ubuntu38:
147-
runs-on: ubuntu-20.04
148-
149-
steps:
150-
- uses: actions/checkout@v2
151-
- uses: conda-incubator/setup-miniconda@v2
152-
with:
153-
auto-update-conda: true
154-
python-version: 3.8
155-
channels: conda-forge,defaults
156-
miniconda-version: "latest"
157-
158-
- name: Install Python packages
159-
uses: actions/setup-python@v4
160-
with:
161-
python-version: '3.8'
162-
163-
- name: Install packages
164-
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
165-
166-
- name: Install SWIG
167-
run: |
168-
mkdir ~/swig-source && cd ~/swig-source
169-
wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
170-
tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
171-
sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
172-
make && make -j4 install
173-
174-
- name: Install conda-build
175-
run: conda install conda-build
176-
177-
- name: Conda build
178-
run: |
179-
cd $GITHUB_WORKSPACE/opensim
180-
conda build .
181-
182-
- name: upload artifact
183-
uses: actions/upload-artifact@v2
184-
with:
185-
name: linux64-opensim-4.4-py38np120.tar.bz2
186-
path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py38np120.tar.bz2
187-
ubuntu39:
188-
runs-on: ubuntu-20.04
189-
190-
steps:
191-
- uses: actions/checkout@v2
192-
- uses: conda-incubator/setup-miniconda@v2
193-
with:
194-
auto-update-conda: true
195-
python-version: 3.9
196-
channels: conda-forge,defaults
197-
miniconda-version: "latest"
198-
199-
- name: Install Python packages
200-
uses: actions/setup-python@v4
201-
with:
202-
python-version: '3.9'
203-
204-
- name: Install numpy
205-
#Need numpy to use SWIG numpy typemaps.
206-
run: python3 -m pip install numpy==1.20.2
20711

208-
- name: Install packages
209-
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
210-
211-
- name: Install SWIG
212-
run: |
213-
mkdir ~/swig-source && cd ~/swig-source
214-
wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
215-
tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
216-
sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
217-
make && make -j4 install
218-
219-
- name: Install conda-build
220-
run: conda install conda-build
221-
222-
- name: Conda build
223-
run: |
224-
cd $GITHUB_WORKSPACE/opensim
225-
conda build .
226-
227-
- name: upload artifact
228-
uses: actions/upload-artifact@v2
229-
with:
230-
name: linux64-opensim-4.4-py39np120.tar.bz2
231-
path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py39np120.tar.bz2
12+
jobs:
23213
ubuntu310:
23314
runs-on: ubuntu-20.04
23415

23516
steps:
236-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
23718
- uses: conda-incubator/setup-miniconda@v2
23819
with:
23920
auto-update-conda: true
@@ -248,62 +29,16 @@ jobs:
24829

24930
- name: Install numpy
25031
#Need numpy to use SWIG numpy typemaps.
251-
run: python3 -m pip install numpy==1.21
252-
253-
- name: Install packages
254-
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
255-
256-
- name: Install SWIG
257-
run: |
258-
mkdir ~/swig-source && cd ~/swig-source
259-
wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
260-
tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
261-
sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
262-
make && make -j4 install
263-
264-
- name: Install conda-build
265-
run: conda install conda-build
266-
267-
- name: Conda build
268-
run: |
269-
cd $GITHUB_WORKSPACE/opensim
270-
conda build .
271-
272-
- name: upload artifact
273-
uses: actions/upload-artifact@v2
274-
with:
275-
name: linux64-opensim-4.4-py310np121.tar.bz2
276-
path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py310np121.tar.bz2
277-
278-
ubuntu311:
279-
runs-on: ubuntu-20.04
280-
281-
steps:
282-
- uses: actions/checkout@v2
283-
- uses: conda-incubator/setup-miniconda@v2
284-
with:
285-
auto-update-conda: true
286-
python-version: '3.11'
287-
channels: conda-forge,defaults
288-
miniconda-version: "latest"
289-
290-
- name: Install Python packages
291-
uses: actions/setup-python@v4
292-
with:
293-
python-version: '3.11'
294-
295-
- name: Install numpy
296-
#Need numpy to use SWIG numpy typemaps.
297-
run: python3 -m pip install numpy==1.23
32+
run: python3 -m pip install numpy==1.25
29833

29934
- name: Install packages
30035
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
30136

30237
- name: Install SWIG
30338
run: |
30439
mkdir ~/swig-source && cd ~/swig-source
305-
wget https://github.com/swig/swig/archive/refs/tags/rel-4.0.2.tar.gz
306-
tar xzf rel-4.0.2.tar.gz && cd swig-rel-4.0.2
40+
wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
41+
tar xzf v4.1.1.tar.gz && cd swig-4.1.1
30742
sh autogen.sh && ./configure --prefix=$HOME/swig --disable-ccache
30843
make && make -j4 install
30944
@@ -316,10 +51,10 @@ jobs:
31651
conda build .
31752
31853
- name: upload artifact
319-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v4
32055
with:
321-
name: linux64-opensim-4.4-py311np123.tar.bz2
322-
path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.4-py311np123.tar.bz2
56+
name: linux64-opensim-4.5.99-py310np125.tar.bz2
57+
path: /usr/share/miniconda3/conda-bld/linux-64/opensim-4.5.99-py310np125.tar.bz2
32358

32459
style:
32560
name: Style

‎.travis.yml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# conda-opensim
2-
Conda recipe for OpenSim 4.4
2+
Conda recipe for opensim packages
33

44
Usage:
55

66
cd conda-opensim
77
conda build opensim
88

99
Only python 3 is supported. Default settings/package doesn't include Moco
10-
Packages with Moco are in a separate opensim-with-moco packages
10+
Packages come with Moco and have version number ending in .99 for dev builds

‎opensim/bld.bat‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ cmake ..\dependencies^
44
-G"Visual Studio 17 2022"^
55
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%"^
66
-DSUPERBUILD_ezc3d=ON^
7-
-DOPENSIM_WITH_TROPTER=OFF^
8-
-DOPENSIM_WITH_CASADI=OFF
7+
-DOPENSIM_WITH_TROPTER=ON^
8+
-DOPENSIM_WITH_CASADI=ON
99

1010
cmake --build . --config Release -- /maxcpucount:8
1111
cd ..
@@ -26,12 +26,15 @@ cmake ..\^
2626
-DBUILD_PYTHON_WRAPPING=ON^
2727
-DOPENSIM_C3D_PARSER=ezc3d^
2828
-DOPENSIM_PYTHON_STANDALONE=ON^
29-
-DOPENSIM_WITH_CASADI=OFF^
29+
-DOPENSIM_WITH_CASADI=ON^
3030
-DOPENSIM_WITH_TROPTER=OFF^
31-
-DBUILD_TESTING=OFF^
31+
-DBUILD_TESTING=ON^
3232
-DBUILD_API_EXAMPLES=OFF^
3333
-DOPENSIM_BUILD_INDIVIDUAL_APPS=ON^
34-
-DOPENSIM_PYTHON_CONDA=ON
34+
-DOPENSIM_PYTHON_CONDA=ON^
35+
-DSWIG_EXECUTABLE="C:/ProgramData/chocolatey/bin/swig.exe"
36+
-LAH
37+
3538
cmake --build . --target install --config Release -- /maxcpucount:8
3639

3740
Rem move Library\sdk\Python Lib

0 commit comments

Comments
 (0)