-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Build HEAD of v2.10 branch, enabling metatensor #5
base: cecam-2023
Are you sure you want to change the base?
Changes from 4 commits
49bcc45
1b8e6fc
e4e9758
4eb7dd1
c70c69e
b11220c
0878ef1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
CONDA_BUILD_SYSROOT: | ||
- /opt/MacOSX10.13.sdk # [osx and x86_64] | ||
- /opt/MacOSX11.0.sdk # [osx and arm64] |
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,10 @@ export CXXFLAGS="${CXXFLAGS//-O2/-O3}" | |
|
||
# libraries are explicitly listed here due to --disable-libsearch | ||
export LIBS="-lboost_serialization -lfftw3 -lgsl -lgslcblas -llapack -lblas -lz $LIBS" | ||
export LIBS="-lmetatensor_torch -lmetatensor -ltorch -lc10 -ltorch_cpu $LIBS" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @Luthaf any specific reason for removing libraries here (boost, fftw3, gslm etc)? I suspect they won't be linked There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I did not remove anything, I added another line below. The full set of libraries will be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry I didn't read correctly the script, it's fine as you did |
||
|
||
# libtorch puts some headers in a non-standard place | ||
export CPPFLAGS="-I$PREFIX/include/torch/csrc/api/include $CPPFLAGS" | ||
|
||
# enable MPI | ||
export CXX=mpic++ | ||
|
@@ -26,8 +30,15 @@ export CXX=mpic++ | |
# --disable-libsearch forces to link only explicitely requested libraries | ||
# --disable-static-patch avoid tests that are only required for static patches | ||
# --disable-static-archive makes package smaller | ||
./configure --prefix=$PREFIX --disable-python --disable-libsearch --disable-static-patch --disable-static-archive --enable-modules=all --enable-boost_serialization | ||
./configure --prefix=$PREFIX \ | ||
--disable-python \ | ||
--disable-libsearch \ | ||
--disable-static-patch \ | ||
--disable-static-archive \ | ||
--enable-modules=all \ | ||
--enable-boost_serialization \ | ||
--enable-metatensor \ | ||
--enable-libtorch | ||
|
||
make -j3 | ||
make install | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
CONDA_BUILD_SYSROOT: | ||
- /opt/MacOSX10.9.sdk # [osx] | ||
mpi: | ||
- mpich | ||
- openmpi |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#! /usr/bin/env bash | ||
|
||
cd python | ||
make pip | ||
export plumed_default_kernel=$PREFIX/lib/libplumedKernel$SHLIB_EXT | ||
#export plumed_disable_rtld_deepbind=yes | ||
|
||
$PYTHON -m pip install . --no-deps -vv | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
python: | ||
- 3.8 | ||
- 3.9 | ||
- 3.10 | ||
- 3.11 | ||
- 3.12 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
{% set name = "py-plumed" %} | ||
{% set version = "2.10" %} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a standard way to make sure the date is baked in the version in some way? What I am thinking about is if a few weeks we release 2.10 it should override this one. Or shall we just increase the build: number below? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you look below, the actual version ends up being There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, I changed this to have the version be This means that when 2.10 is released, it will be used instead of this one, since conda is following PEP440: https://peps.python.org/pep-0440/ |
||
{% set git_rev = "b0ffcb55ad8cc3c71ec5c30a1bd46f68dd33bceb" %} | ||
|
||
package: | ||
name: {{ name|lower }} | ||
version: {{ version }}.git.{{ git_rev }} | ||
|
||
source: | ||
# url: https://github.com/plumed/plumed2/archive/v{{ version }}.tar.gz | ||
# sha256: 612d2387416b5f82dd8545709921440370e144fd46cef633654cf0ee43bac5f8 | ||
git_url: https://github.com/plumed/plumed2.git | ||
git_rev: {{ git_rev }} | ||
|
||
build: | ||
number: 0 | ||
skip: True # [win or py2k] | ||
|
||
requirements: | ||
build: | ||
- {{ compiler('c') }} | ||
- make | ||
host: | ||
- python | ||
- pip | ||
- cython | ||
run: | ||
- plumed | ||
- python | ||
|
||
test: | ||
imports: | ||
- plumed | ||
commands: | ||
- python -c "import plumed; p=plumed.Plumed(); print(p)" | ||
|
||
about: | ||
home: http://www.plumed.org/ | ||
license: LGPL-3.0 | ||
license_family: GPL | ||
license_file: COPYING.LESSER | ||
summary: 'Python wrappers for plumed library' | ||
description: | | ||
PLUMED is an open source library for free energy calculations in | ||
molecular systems which works together with some of the most | ||
popular molecular dynamics engines. | ||
doc_url: https://www.plumed.org/doc | ||
dev_url: https://github.com/plumed/plumed2 | ||
|
||
extra: | ||
recipe-maintainers: | ||
- GiovanniBussi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Useful trick (
-m
), so that we have them in a single place, thanks!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes! And this is intentionally not in the repository root, to prevent it from being picked on local builds: https://docs.conda.io/projects/conda-build/en/latest/resources/variants.html#conda-build-variant-config-files