Skip to content

Commit a9e6d33

Browse files
authored
Merge pull request #484 from hiddenSymmetries/pybind_change
Unused pybind11 module removed
2 parents 651ac8c + 87e6cde commit a9e6d33

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
[submodule "thirdparty/xtl"]
88
path = thirdparty/xtl
99
url = https://github.com/xtensor-stack/xtl.git
10-
[submodule "thirdparty/pybind11"]
11-
path = thirdparty/pybind11
12-
url = https://github.com/pybind/pybind11.git
1310
[submodule "thirdparty/xsimd"]
1411
path = thirdparty/xsimd
1512
url = https://github.com/xtensor-stack/xsimd.git

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ else()
111111
message(STATUS "Boost include dirs are ${Boost_INCLUDE_DIRS}")
112112
endif()
113113

114-
# add_subdirectory(thirdparty/pybind11)
115114
add_subdirectory(thirdparty/fmt EXCLUDE_FROM_ALL)
116115
set(XTENSOR_USE_OPENMP 0)
117116
set(XTENSOR_USE_TBB 0)

ci/Dockerfile.ubuntu

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM --platform=linux/amd64 ubuntu:22.04 as intermediate
44

55
RUN apt update && \
6-
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential gfortran git m4 wget cmake ninja-build \
6+
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential gfortran git m4 wget \
77
libopenblas-dev libfftw3-dev libhdf5-dev libhdf5-serial-dev libnetcdf-dev libnetcdff-dev libgl1-mesa-dev \
88
python3-dev python3-pip python3-venv libxrender1
99

@@ -23,9 +23,18 @@ RUN \
2323
cd .. && \
2424
rm -rf $mpich_prefix
2525

26-
2726
RUN /sbin/ldconfig
2827

28+
RUN python3 -m pip install wheel
29+
RUN python3 -m venv /venv/
30+
31+
RUN /venv/bin/pip install -U pip
32+
# 2024-11-12 MJL: mpi4py < 4.0 in the next line is due to
33+
# https://github.com/hiddenSymmetries/simsopt/issues/455
34+
# Once NERSC gets Shifter working with mpi4py >= 4 we can remove this inequality
35+
RUN /venv/bin/python -m pip install numpy scipy jax jaxlib f90nml "mpi4py<4.0" jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake f90wrap h5py
36+
ENV PATH="/venv/bin:${PATH}"
37+
2938
RUN \
3039
git clone --depth 1 https://github.com/Reference-ScaLAPACK/scalapack.git scalapack && \
3140
mkdir scalapack/build && \
@@ -36,15 +45,6 @@ RUN \
3645

3746
RUN /sbin/ldconfig
3847

39-
RUN python3 -m pip install wheel
40-
RUN python3 -m venv /venv/
41-
42-
RUN /venv/bin/pip install -U pip
43-
# 2024-11-12 MJL: mpi4py < 4.0 in the next line is due to
44-
# https://github.com/hiddenSymmetries/simsopt/issues/455
45-
# Once NERSC gets Shifter working with mpi4py >= 4 we can remove this inequality
46-
RUN /venv/bin/python -m pip install numpy scipy jax jaxlib f90nml "mpi4py<4.0" jupyter notebook ipython qsc sympy scikit-build ninja "pybind11[global]" cmake f90wrap h5py
47-
ENV PATH="/venv/bin:${PATH}"
4848

4949
RUN git clone --depth 1 https://github.com/PrincetonUniversity/SPEC.git /src/SPEC && \
5050
cd /src/SPEC && \

thirdparty/pybind11

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

0 commit comments

Comments
 (0)