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

Implement a region calculus #995

Open
wants to merge 75 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
47cb769
Import region calculus functions
eschnett May 25, 2021
84796f8
Add example classes `point` and `ndpoint`
eschnett May 28, 2021
7eb8dbe
Re-write Point class
eschnett Jun 4, 2021
5d0e233
Implement Regions::Box
eschnett Jun 5, 2021
40232dd
Clean up namespaces
eschnett Jun 5, 2021
3e39868
First cut at bounding box sets
eschnett Jun 6, 2021
83c48f4
More tests (and error corrections) for regions
eschnett Jun 7, 2021
11d512d
Add example. Use C++17 for regions.
eschnett Jun 7, 2021
b4d05e5
Add missing include files
eschnett Jun 7, 2021
860ffc4
Correct #include statements
eschnett Jun 7, 2021
6e83f3a
Avoid some compiler warnings
eschnett Jun 7, 2021
e94bf59
Mark function argument as used
eschnett Jun 7, 2021
940d57f
Avoid more compiler warnings
eschnett Jun 7, 2021
5b9a95c
Avoid compiler warnings
eschnett Jun 7, 2021
529b4ac
Avoid compiler warnings
eschnett Jun 7, 2021
75d5661
Avoid compiler warnings
eschnett Jun 8, 2021
01ff022
Avoid compiler warnings
eschnett Jun 8, 2021
b5c0138
Avoid compiler warnings
eschnett Jun 8, 2021
1f76327
Avoid compiler warnings
eschnett Jun 8, 2021
e0b85dc
CI: Use GCC 7 instead of GCC 5
eschnett Jun 8, 2021
483bd2a
Avoid compiler warnings
eschnett Jun 8, 2021
8b3b3ad
Correct integer division by zero
eschnett Jun 8, 2021
331b48b
Correct equality and comparison operators
eschnett Jun 8, 2021
f1f3c11
cmake: New option for C++17
eschnett Jun 8, 2021
cf46121
Switch back to GCC5
eschnett Jun 8, 2021
0751fca
Avoid compiler warnings
eschnett Jun 8, 2021
ac9af25
CI: Enable C++17 where supported
eschnett Jun 8, 2021
e144d3a
Make comparison manifestly type-safe
eschnett Jun 8, 2021
c7b8cf2
Disable C++ on systems where it doesn't work
eschnett Jun 8, 2021
4b373a6
Try to avoid comparison failures
eschnett Jun 8, 2021
bdd1971
Avoid compiler warnings
eschnett Jun 8, 2021
77358ae
Try to allow comparing infinities
eschnett Jun 8, 2021
99a6e62
CI: Disable C++17 for clang-tidy
eschnett Jun 8, 2021
055ffb7
Update catch2 calls
eschnett Jun 8, 2021
1463411
CI: Enable debug info
eschnett Jun 8, 2021
a689ecf
Add debug statements
eschnett Jun 8, 2021
fadb375
More debug tests
eschnett Jun 8, 2021
b145c02
Correct illegal memory access
eschnett Jun 8, 2021
686d14d
Beautify output in example 13
eschnett Jun 8, 2021
2ac1e7f
New constructor NDPoint(Point)
eschnett Jun 8, 2021
3fb5920
Try to appease icpc
eschnett Jun 8, 2021
fb084cc
Complete regions example
eschnett Jun 14, 2021
6fa5863
Rename set property functions
eschnett Jun 18, 2021
c09057f
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jun 18, 2021
3bedaee
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jun 22, 2021
3a45617
Update example
eschnett Jun 23, 2021
2f5018f
Make region algebra optional
eschnett Jun 23, 2021
84d9108
Require C++17 for the region algebra
eschnett Jun 24, 2021
e9a46cd
Remove unintended CMakeLists change
eschnett Jun 24, 2021
c59bc20
CI: Update regions options
eschnett Jun 24, 2021
5d76387
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jun 24, 2021
b5afb43
Implement NDBox
eschnett Jun 25, 2021
5145971
CMake: Debug regions settings
eschnett Jun 26, 2021
7d65e4d
CMake: Remove debug output
eschnett Jun 26, 2021
6159f94
Implement NDRegion
eschnett Jun 26, 2021
93cc8d3
CMake: Correct C++17 tests
eschnett Jun 26, 2021
aa6b0be
CI: Disable regions on icc
eschnett Jun 26, 2021
c435db2
Tests: Compare ndims with signed integer
eschnett Jun 26, 2021
93ad888
CI: Debug
eschnett Jun 26, 2021
0c46a71
CI: Disable regions on Windows
eschnett Jun 26, 2021
68d409a
CI: Correct typo
eschnett Jun 26, 2021
2fd5c9b
Regions: Add comments
eschnett Jun 27, 2021
a2f07e7
Regions: Remove unused code
eschnett Jun 27, 2021
10fe81b
Regions: Document boxes
eschnett Jun 27, 2021
15399b1
Document Regionss
eschnett Jun 27, 2021
c436db6
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jul 8, 2021
8d1de67
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jul 12, 2021
8f843cc
Remove unwanted files
eschnett Jul 12, 2021
092569f
Use `#pragma once`
eschnett Jul 12, 2021
d617383
Abort when openPMD_USE_REGIONS is requested, but C++17 is not supported
eschnett Jul 12, 2021
36551f2
Use `using` instead of `typedef`
eschnett Jul 12, 2021
23f2133
cmake: Disable Regions by default
eschnett Jul 12, 2021
5939968
Don't use std::ptrdiff type
franzpoeschel Jul 13, 2021
368d2f3
Merge pull request #1 from franzpoeschel/regioncalculus-warnings
eschnett Jul 23, 2021
32424d8
Merge branch 'dev' into eschnett/regioncalculus
eschnett Jul 23, 2021
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
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ before_build:
# - cmd: if "%TARGET_ARCH%"=="x64" "C:\Program Files (x86)\Microsoft Visual Studio 15.9\VC\vcvarsall.bat" amd64

# CMake configure
- cmd: cmake -G "%OPENPMD_CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_SHARED_LIBS=%SHARED% -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX="%CONDA_INSTALL_LOCN%" -DCMAKE_INSTALL_BINDIR="Library\bin" ".."
- cmd: cmake -G "%OPENPMD_CMAKE_GENERATOR%" -DopenPMD_USE_REGIONS=OFF -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_SHARED_LIBS=%SHARED% -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX="%CONDA_INSTALL_LOCN%" -DCMAKE_INSTALL_BINDIR="Library\bin" ".."

build_script:
- cmd: cmake --build . --config %CONFIGURATION%
Expand Down
61 changes: 61 additions & 0 deletions .github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# This is a Spack environment file.
#
# Activating and installing this environment will provide all dependencies
# that are needed for full-feature development.
# https//spack.readthedocs.io/en/latest/environments.html#anonymous-environments
#
spack:
specs:
- adios
- adios2
- hdf5
- openmpi

packages:
adios:
variants: ~zfp ~sz ~lz4 ~blosc
adios2:
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
cmake:
externals:
- spec: "cmake"
prefix: /usr
buildable: False
openmpi:
externals:
- spec: "openmpi"
prefix: /usr
buildable: False
perl:
externals:
- spec: "perl"
prefix: /usr
buildable: False
python:
externals:
- spec: "python"
prefix: /usr
buildable: False
all:
target: ['x86_64']
variants: ~fortran
compiler: [[email protected]]

compilers:
- compiler:
environment: {}
extra_rpaths: []
flags: {}
modules: []
operating_system: ubuntu18.04
paths:
cc: /usr/bin/gcc-7
cxx: /usr/bin/g++-7
f77: /usr/bin/gfortran
fc: /usr/bin/gfortran
spec: [email protected]
target: x86_64

config:
build_jobs: 2

Loading