Skip to content
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

Move pybind11 to /ext #1968

Merged
merged 3 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ max_complexity = 15
extend-exclude =
# 3rd party
ext,
python/pybind11,
# auto-generated
doc/scripts/inputs.py
doc/scripts/make_images.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Python Formatting
uses: psf/black@stable
with:
options: --check --extend-exclude '/(ext|python/pybind11|doc/scripts/.*_theme|doc/scripts/inputs.py)'
options: --check --extend-exclude '/(ext|doc/scripts/.*_theme|doc/scripts/inputs.py)'
src: scripts/build-catalogue.in .
- name: Python analysis
run: |
Expand Down
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
path = ext/google-benchmark
url = https://github.com/google/benchmark
branch = main
[submodule "python/pybind11"]
path = python/pybind11
url = https://github.com/pybind/pybind11.git
branch = master
[submodule "ext/fmt"]
path = ext/fmt
url = https://github.com/fmtlib/fmt.git
Expand All @@ -18,3 +14,6 @@
path = ext/json
url = https://github.com/nlohmann/json.git
branch = master
[submodule "ext/pybind11"]
path = ext/pybind11
url = https://github.com/pybind/pybind11.git
2 changes: 1 addition & 1 deletion doc/contrib/coding-style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ run the following commands to apply it:
# Install the formatter if not present
pip install black
# Automatically apply style. If unsure what this does read on.
black --extend-exclude '/(ext|python/pybind11|doc/scripts/.*_theme)' . scripts/build-catalogue.in
black --extend-exclude '/(ext|doc/scripts/.*_theme)' . scripts/build-catalogue.in

The formatter can also be run with ``--check`` to list offending files and
``--diff`` to preview changes. Most editors can `integrate with black
Expand Down
2 changes: 1 addition & 1 deletion doc/dependencies.csv
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bench,Google-benchmark,,submodule ``ext/google-benchmark``,
--,random123,,source copy ``ext/random123``,
--,fmt,,submodule ``ext/fmt``,
--,tinyopt,,source copy ``ext/tinyopt``,
ARB_WITH_PYTHON,pybind11,,submodule ``python/pybind11``,
ARB_WITH_PYTHON,pybind11,,submodule ``ext/pybind11``,
ARB_WITH_PYTHON,Python,3.7,Python compatiblity is the range between the latest officially released point version and the minimum here specified.,"* it is not more advanced than the version specified by NEP 29.
* it is available as a cray-python version on Piz Daint
* it is available on labs.ebrains.eu
Expand Down
4 changes: 2 additions & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if(ARB_USE_BUNDLED_PYBIND11)
include(FindPythonModule) # required for find_python_module

# Set up pybind11 as an external project.
set(pb11_src_dir "${PROJECT_SOURCE_DIR}/python/pybind11")
set(pb11_src_dir "${PROJECT_SOURCE_DIR}/ext/pybind11")
check_git_submodule(pybind11 "${pb11_src_dir}")

if(NOT pybind11_avail)
Expand All @@ -14,7 +14,7 @@ if(ARB_USE_BUNDLED_PYBIND11)
# Set up pybind11, which is used to generate Python bindings.
# Pybind11 has good cmake support, so just add the pybind11 directory,
# instead of using find_package.
add_subdirectory(pybind11)
add_subdirectory(${pb11_src_dir} pybind11)
else()
find_package(pybind11 REQUIRED)
endif()
Expand Down