-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into clang_tidy_all_performance_checks
- Loading branch information
Showing
36 changed files
with
432 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ FROM quay.io/pypa/manylinux2010_x86_64 as build-env | |
| # FROM quay.io/pypa/manylinux1_x86_64 as build-env | ||
| ENV DEBIAN_FRONTEND noninteractive | ||
|
|
||
| # Python 3.8-3.11 via "38 39 311" | ||
| ARG PY_VERSIONS="38 39 310 311" | ||
| # Python 3.8-3.12 via "38 39 311 312" | ||
| ARG PY_VERSIONS="38 39 310 311 312" | ||
|
|
||
| # static libs need relocatable symbols for linking to shared python lib | ||
| ENV CFLAGS="-fPIC ${CFLAGS}" | ||
|
|
@@ -162,7 +162,7 @@ FROM debian:bullseye | |
| ENV DEBIAN_FRONTEND noninteractive | ||
| COPY --from=build-env /wheelhouse/openPMD_api-*-cp311-cp311-manylinux2010_x86_64.whl . | ||
| RUN apt-get update \ | ||
| && apt-get install -y --no-install-recommends python3.10 python3-distutils ca-certificates curl \ | ||
| && apt-get install -y --no-install-recommends python3.11 python3-distutils ca-certificates curl \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| RUN python3.11 --version \ | ||
| && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ | ||
|
|
@@ -172,6 +172,21 @@ RUN python3.11 -c "import openpmd_api as io; print(io.__version__); print | |
| RUN python3.11 -m openpmd_api.ls --help | ||
| RUN openpmd-ls --help | ||
|
|
||
| # test in fresh env: Debian:Bullseye + Python 3.12 | ||
| FROM debian:bullseye | ||
| ENV DEBIAN_FRONTEND noninteractive | ||
| COPY --from=build-env /wheelhouse/openPMD_api-*-cp312-cp312-manylinux2010_x86_64.whl . | ||
| RUN apt-get update \ | ||
| && apt-get install -y --no-install-recommends python3.12 python3-distutils ca-certificates curl \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| RUN python3.12 --version \ | ||
| && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ | ||
| && python3.12 get-pip.py \ | ||
| && python3.12 -m pip install openPMD_api-*-cp312-cp312-manylinux2010_x86_64.whl | ||
| RUN python3.12 -c "import openpmd_api as io; print(io.__version__); print(io.variants)" | ||
| RUN python3.12 -m openpmd_api.ls --help | ||
| RUN openpmd-ls --help | ||
|
|
||
| # copy binary artifacts (wheels) | ||
| FROM quay.io/pypa/manylinux2010_x86_64 | ||
| MAINTAINER Axel Huebl <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* Copyright 2023 Franz Poeschel | ||
| * | ||
| * This file is part of openPMD-api. | ||
| * | ||
| * openPMD-api is free software: you can redistribute it and/or modify | ||
| * it under the terms of of either the GNU General Public License or | ||
| * the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * openPMD-api is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License and the GNU Lesser General Public License | ||
| * for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * and the GNU Lesser General Public License along with openPMD-api. | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include <array> | ||
| #include <complex> | ||
| #include <vector> | ||
|
|
||
| // Need to alias this to avoid the comma | ||
| // Cannot use a namespace, otherwise the macro will work either only within | ||
| // or outside the namespace | ||
| // Defining macros means polluting the global namespace anyway | ||
| using openpmd_array_double_7 = std::array<double, 7>; | ||
|
|
||
| #define OPENPMD_FOREACH_DATATYPE(MACRO) \ | ||
| MACRO(char) \ | ||
| MACRO(unsigned char) \ | ||
| MACRO(signed char) \ | ||
| MACRO(short) \ | ||
| MACRO(int) \ | ||
| MACRO(long) \ | ||
| MACRO(long long) \ | ||
| MACRO(unsigned short) \ | ||
| MACRO(unsigned int) \ | ||
| MACRO(unsigned long) \ | ||
| MACRO(unsigned long long) \ | ||
| MACRO(float) \ | ||
| MACRO(double) \ | ||
| MACRO(long double) \ | ||
| MACRO(std::complex<float>) \ | ||
| MACRO(std::complex<double>) \ | ||
| MACRO(std::complex<long double>) \ | ||
| MACRO(std::string) \ | ||
| MACRO(std::vector<char>) \ | ||
| MACRO(std::vector<short>) \ | ||
| MACRO(std::vector<int>) \ | ||
| MACRO(std::vector<long>) \ | ||
| MACRO(std::vector<long long>) \ | ||
| MACRO(std::vector<unsigned char>) \ | ||
| MACRO(std::vector<unsigned short>) \ | ||
| MACRO(std::vector<unsigned int>) \ | ||
| MACRO(std::vector<unsigned long>) \ | ||
| MACRO(std::vector<unsigned long long>) \ | ||
| MACRO(std::vector<float>) \ | ||
| MACRO(std::vector<double>) \ | ||
| MACRO(std::vector<long double>) \ | ||
| MACRO(std::vector<std::complex<float>>) \ | ||
| MACRO(std::vector<std::complex<double>>) \ | ||
| MACRO(std::vector<std::complex<long double>>) \ | ||
| MACRO(std::vector<signed char>) \ | ||
| MACRO(std::vector<std::string>) \ | ||
| MACRO(openpmd_array_double_7) \ | ||
| MACRO(bool) | ||
|
|
||
| #define OPENPMD_FOREACH_NONVECTOR_DATATYPE(MACRO) \ | ||
| MACRO(char) \ | ||
| MACRO(unsigned char) \ | ||
| MACRO(signed char) \ | ||
| MACRO(short) \ | ||
| MACRO(int) \ | ||
| MACRO(long) \ | ||
| MACRO(long long) \ | ||
| MACRO(unsigned short) \ | ||
| MACRO(unsigned int) \ | ||
| MACRO(unsigned long) \ | ||
| MACRO(unsigned long long) \ | ||
| MACRO(float) \ | ||
| MACRO(double) \ | ||
| MACRO(long double) \ | ||
| MACRO(std::complex<float>) \ | ||
| MACRO(std::complex<double>) \ | ||
| MACRO(std::complex<long double>) \ | ||
| MACRO(std::string) \ | ||
| MACRO(array_double_7) \ | ||
| MACRO(bool) | ||
|
|
||
| #define OPENPMD_FOREACH_DATASET_DATATYPE(MACRO) \ | ||
| MACRO(char) \ | ||
| MACRO(unsigned char) \ | ||
| MACRO(signed char) \ | ||
| MACRO(short) \ | ||
| MACRO(int) \ | ||
| MACRO(long) \ | ||
| MACRO(long long) \ | ||
| MACRO(unsigned short) \ | ||
| MACRO(unsigned int) \ | ||
| MACRO(unsigned long) \ | ||
| MACRO(unsigned long long) \ | ||
| MACRO(float) \ | ||
| MACRO(double) \ | ||
| MACRO(long double) \ | ||
| MACRO(std::complex<float>) \ | ||
| MACRO(std::complex<double>) \ | ||
| MACRO(std::complex<long double>) \ | ||
| MACRO(std::array<double, 7>) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* Copyright 2023 Franz Poeschel | ||
| * | ||
| * This file is part of openPMD-api. | ||
| * | ||
| * openPMD-api is free software: you can redistribute it and/or modify | ||
| * it under the terms of of either the GNU General Public License or | ||
| * the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * openPMD-api is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License and the GNU Lesser General Public License | ||
| * for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * and the GNU Lesser General Public License along with openPMD-api. | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #undef OPENPMD_FOREACH_DATATYPE | ||
| #undef OPENPMD_FOREACH_NONVECTOR_DATATYPE | ||
| #undef OPENPMD_FOREACH_DATASET_DATATYPE |
Oops, something went wrong.