Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ environment:
- TARGET_ARCH: x64
CONDA_PY: 3.10
CONDA_INSTALL_LOCN: C:\\Miniconda37-x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
platform: x64
SHARED: OFF

Expand Down Expand Up @@ -101,12 +101,12 @@ before_build:
# Compiler & Generator Selection
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set OPENPMD_CMAKE_GENERATOR=Visual Studio 15 2017
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" set OPENPMD_CMAKE_GENERATOR=Visual Studio 16 2019
- cmd: if "%TARGET_ARCH%"=="x64" set OPENPMD_CMAKE_GENERATOR=%OPENPMD_CMAKE_GENERATOR% Win64
# - cmd: if "%TARGET_ARCH%"=="x86" "C:\Program Files (x86)\Microsoft Visual Studio 15.9\VC\vcvarsall.bat" x86
# - 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 -DopenPMD_USE_PYTHON=ON -DPython_EXECUTABLE="%CONDA_INSTALL_LOCN%\python.exe" -DCMAKE_INSTALL_PREFIX="%CONDA_INSTALL_LOCN%" -DCMAKE_INSTALL_BINDIR="Library\bin" ".."
- cmd: if "%TARGET_ARCH%"=="x64" cmake -G "%OPENPMD_CMAKE_GENERATOR%" -A "%TARGET_ARCH%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_SHARED_LIBS=%SHARED% -DBUILD_TESTING=ON -DopenPMD_USE_PYTHON=ON -DPython_EXECUTABLE="%CONDA_INSTALL_LOCN%\python.exe" -DCMAKE_INSTALL_PREFIX="%CONDA_INSTALL_LOCN%" -DCMAKE_INSTALL_BINDIR="Library\bin" ".."
- cmd: if "%TARGET_ARCH%"=="x86" cmake -G "%OPENPMD_CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_SHARED_LIBS=%SHARED% -DBUILD_TESTING=ON -DopenPMD_USE_PYTHON=ON -DPython_EXECUTABLE="%CONDA_INSTALL_LOCN%\python.exe" -DCMAKE_INSTALL_PREFIX="%CONDA_INSTALL_LOCN%" -DCMAKE_INSTALL_BINDIR="Library\bin" ".."

build_script:
- cmd: cmake --build . --config %CONFIGURATION% -j 2
Expand Down
10 changes: 5 additions & 5 deletions share/openPMD/download_samples.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ Invoke-WebRequest https://github.com/openPMD/openPMD-example-datasets/raw/566b35
7z.exe x -r example-3d-bp4.tar
7z.exe x -r legacy_datasets.tar.gz
7z.exe x -r legacy_datasets.tar
Move-Item -Path example-3d\hdf5\* samples\git-sample\
Move-Item -Path example-thetaMode\hdf5\* samples\git-sample\thetaMode\
Move-Item -Path example-3d-bp4\* samples\git-sample\3d-bp4\
Move-Item -Path legacy_datasets\* samples\git-sample\legacy\
Move-Item -Path example-3d\hdf5\* -Destination samples\git-sample\ -Force
Move-Item -Path example-thetaMode\hdf5\* -Destination samples\git-sample\thetaMode\ -Force
Move-Item -Path example-3d-bp4\* -Destination samples\git-sample\3d-bp4\ -Force
Move-Item -Path legacy_datasets\* -Destination samples\git-sample\legacy\ -Force
Remove-Item -Recurse -Force example-3d*
Remove-Item -Recurse -Force example-thetaMode*
Remove-Item -Recurse -Force example-3d-bp4*
Expand All @@ -44,7 +44,7 @@ Remove-Item *.zip
# Ref.: https://github.com/openPMD/openPMD-viewer/issues/296
Invoke-WebRequest https://github.com/openPMD/openPMD-viewer/files/5655027/diags.zip -OutFile empty_alternate_fbpic.zip
Expand-Archive empty_alternate_fbpic.zip
Move-Item -Path empty_alternate_fbpic\diags\hdf5\data00000050.h5 samples\issue-sample\empty_alternate_fbpic_00000050.h5
Move-Item -Path empty_alternate_fbpic\diags\hdf5\data00000050.h5 -Destination samples\issue-sample\empty_alternate_fbpic_00000050.h5 -Force
Remove-Item -Recurse -Force empty_alternate_fbpic*

cd $orgdir
15 changes: 3 additions & 12 deletions src/IO/ADIOS/ADIOS2PreloadAttributes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,22 +330,13 @@ AttributeWithShapeAndResource<T>::operator bool() const
}

#define OPENPMD_INSTANTIATE_GETATTRIBUTE(type) \
template struct AttributeWithShape<type>; \
template struct AttributeWithShapeAndResource<type>; \
template AttributeWithShape<type> PreloadAdiosAttributes::getAttribute( \
std::string const &name) const; \
template auto AdiosAttributes::getAttribute( \
size_t step, adios2::IO &IO, std::string const &name) const \
-> AttributeWithShapeAndResource<type>; \
template AttributeWithShapeAndResource< \
type>::AttributeWithShapeAndResource(AttributeWithShape<type> parent); \
template AttributeWithShapeAndResource<type>:: \
AttributeWithShapeAndResource( \
size_t len_in, \
type const \
*data_in, /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
std::optional<std::vector<type>> resource_in); \
template AttributeWithShapeAndResource< \
type>::AttributeWithShapeAndResource(adios2::Attribute<type> attr); \
template AttributeWithShapeAndResource<type>::operator bool() const;
-> AttributeWithShapeAndResource<type>;
ADIOS2_FOREACH_TYPE_1ARG(OPENPMD_INSTANTIATE_GETATTRIBUTE)
#undef OPENPMD_INSTANTIATE_GETATTRIBUTE
} // namespace openPMD::detail
Expand Down
Loading