Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit edb3de6

Browse files
authored
remove pybind submodule (#1556)
1 parent 192df9c commit edb3de6

File tree

5 files changed

+5
-18
lines changed

5 files changed

+5
-18
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "pybind11"]
2-
path = ext/pybind11
3-
url = https://github.com/pybind/pybind11
41
[submodule "doc/source/legacy-notebooks"]
52
path = doc/source/legacy-notebooks
63
url = https://github.com/markovmodel/PyEMMA_IPython.git

ext/pybind11

Lines changed: 0 additions & 1 deletion
This file was deleted.

pyemma/msm/tests/test_its.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ def test_its_msm(self):
263263
assert np.allclose(estimator.timescales, ref, rtol=0.1, atol=10.0)
264264

265265
def test_its_bmsm(self):
266-
estimator = msm.its([self.double_well_data.dtraj_T100K_dt10_n6good], lags = [10, 50, 200],
267-
errors='bayes', nsamples=1000, n_jobs=2)
266+
estimator = msm.timescales_msm([self.double_well_data.dtraj_T100K_dt10_n6good], lags = [10, 50, 200],
267+
errors='bayes', nsamples=1000, n_jobs=1)
268268
ref = np.array([[ 284.87479737, 6.68390402, 3.0375248, 2.65314172, 1.93066562],
269269
[ 320.08583492, 11.14612743, 10.3450663, 9.42799075, 8.2109752 ],
270270
[ 351.41541961, 42.87427869, 41.17841657, 37.35485197, 23.24254608]])

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ requires = [
66
"Cython>=0.22",
77
"scipy",
88
"mdtraj",
9-
# TODO: include again once https://github.com/pybind/pybind11/issues/1067 is fixed.
10-
#"pybind11",
9+
"pybind11",
1110
"deeptime"
1211
]
1312

setup.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import versioneer
3232
import warnings
3333
from io import open
34+
import pybind11
3435

3536
from setuptools import setup, Extension, find_packages
3637

@@ -74,7 +75,7 @@
7475
def extensions():
7576
from Cython.Build import cythonize
7677
from numpy import get_include as np_get_include
77-
pybind_inc = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'ext', 'pybind11', 'include')
78+
pybind_inc = pybind11.get_include()
7879
assert os.path.exists(pybind_inc), 'pybind11 headers not found at %s' % pybind_inc
7980

8081
from mdtraj import capi as mdtraj_capi
@@ -323,15 +324,6 @@ def build_extensions(self):
323324

324325
if __name__ == '__main__':
325326
if parse_setuppy_commands():
326-
# only require numpy and extensions in case of building/installing
327-
# first initialize submodules
328-
if os.path.exists('.git'):
329-
import subprocess
330-
modules = [os.path.join('ext', 'pybind11')]
331-
cmd = "git submodule update --init {mod}"
332-
333-
for m in modules:
334-
subprocess.check_call(cmd.format(mod=m).split(' '))
335327
# now build extension list.
336328
metadata['ext_modules'] = extensions()
337329

0 commit comments

Comments
 (0)