Skip to content

Commit 1dc5aeb

Browse files
authored
Openms 2.8 (#33351)
* adapt nightlies to 2.8 dev cycle * fix patch for new code * remove all patches. not needed anymore * change boost finding and enable debug for it * was it the comments??? * bump autowrap * Add dependencies to libopenms again. Problems after install * Bump build number to check * Added back all dependencies to openms bins as well * try to separate openms and pyopenms * cleanp * contrib path? * braces * parent * use SRCDIR * hardcode openms version * change version * add conda config to ignore py2 and have same compiler * use new cmake install components for installing * need cmake to run cmake install * add some more deps to pyopensm * use no_dependencies in pyopenms * remove . before dev version * remove . before dev version * add equals to version dep? * well specify without ninja variable * forgot to install * Update meta.yaml * Path to wheel * Update build.sh * remove newlines * cleanup * switch from nightly to release * reset build number and limit builds * forgot to save * remove pyopenms since bioconda cannot figure out dependencies * do not specify versions of pinned packages? I thought I would do the ridiculously slow solver a favor.. but conda is just full of bugs * add gplots, see #32788
1 parent 24f315d commit 1dc5aeb

13 files changed

+76
-268
lines changed

recipes/openms-meta/MANIFEST.in.patch

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

recipes/openms-meta/ParamValue_h.patch

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

recipes/openms-meta/apple_pyoms_nofixup.patch

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

recipes/openms-meta/build.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ fi
3333
LDFLAGS='-Wl,-rpath,${RPATH}'
3434

3535
cmake .. \
36-
-DOPENMS_CONTRIB_LIBS='../../contrib-build' \
3736
-DOPENMS_GIT_SHORT_REFSPEC="release/${PKG_VERSION}" \
38-
-DOPENMS_GIT_SHORT_SHA1="9110e58" \
37+
-DOPENMS_GIT_SHORT_SHA1="b59e0c3" \
38+
-DOPENMS_CONTRIB_LIBS="$SRC_DIR/contrib-build" \
3939
-DCMAKE_BUILD_TYPE="Release" \
4040
-DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT} \
4141
-DCMAKE_MACOSX_RPATH=ON \
@@ -53,8 +53,7 @@ cmake .. \
5353
-DBoost_ARCHITECTURE="-x64" \
5454
-DBUILD_EXAMPLES=OFF
5555

56-
make -j${CPU_COUNT} OpenMS TOPP UTILS
57-
# The subpackages will do that (unfortunately "make install" installs everything right away)
58-
# Another option would be to install somewhere into the build dir (to use the existent install commands)
59-
# and then copy the relevant parts to the prefix. See CMAKE_INSTALL_PREFIX.
56+
# limit concurrent build jobs due to memory usage on CI
57+
make -j4 OpenMS TOPP UTILS
58+
# The subpackages will do the installing of the parts
6059
#make install

recipes/openms-meta/c17.patch

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

recipes/openms-meta/compilerflags.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
python:
22
- 3.9.* *_cpython
3-
- 3.8.* *_cpython
43
python_impl:
54
- cpython
6-
c_compiler_version: # [linux]
7-
- 11 # [linux]
8-
cxx_compiler_version: # [linux]
9-
- 11 # [linux]
5+
numpy:
6+
- 1.19.*

recipes/openms-meta/init.py.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#!/bin/bash
22
# TODO actually it would be better if we could adapt our MANIFEST.in
33
# to not package the openms libs and dependencies again. Same for share.
4-
54
pushd build
6-
cmake -DPYOPENMS=ON -DPY_NUM_THREADS=1 -DPY_NUM_MODULES=12 .
5+
cmake -DPYOPENMS=ON -DNO_DEPENDENCIES=ON . #-DPY_NUM_THREADS=1 -DPY_NUM_MODULES=12 .
76
# Unfortunately if we would call make, it thinks that OpenMS lib is not built since the build folder
87
# might have been copied, so it rebuilds. Skip this by using setup.py directly.
98
# TODO check that it actually uses the prebuilt libOpenMS from the prefix.
109
#make -j${CPU_COUNT} pyopenms
1110
pushd pyOpenMS
1211
$PYTHON create_cpp_extension.py
1312
# try to separate the extension building from the rest. Let's hope pip install is smart enough to not do it again.
14-
$PYTHON setup.py build_ext -j 1 --single-threaded
13+
$PYTHON setup.py build_ext #-j 1 --single-threaded
1514
$PYTHON -m pip install . --ignore-installed --no-deps
1615
popd
1716
popd

0 commit comments

Comments
 (0)