Skip to content

Commit 173919d

Browse files
committed
ci,python: enable python win2022 serial build
1 parent 35f7225 commit 173919d

File tree

5 files changed

+32
-9
lines changed

5 files changed

+32
-9
lines changed

bindings/Python/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ configure_file(
3838
set_target_properties(adios2_py PROPERTIES
3939
CXX_VISIBILITY_PRESET hidden
4040
OUTPUT_NAME adios2_bindings${ADIOS2_LIBRARY_SUFFIX}
41-
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
42-
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
43-
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
44-
PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
45-
COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
41+
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings$<0:>
42+
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings$<0:>
43+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings$<0:>
44+
PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings$<0:>
45+
COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings$<0:>
4646
)
4747

4848
set(install_location "${CMAKE_INSTALL_PYTHONDIR}/adios2")

bindings/Python/__init__.py.in

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1-
from .adios2_bindings@ADIOS2_LIBRARY_SUFFIX@ import *
1+
import os
2+
import sys
3+
4+
from pathlib import Path
5+
6+
sys.path.append(os.path.dirname(__file__))
7+
8+
if sys.platform.startswith('win'):
9+
print("Inject dll")
10+
os.add_dll_directory(os.path.dirname(__file__))
11+
os.add_dll_directory(Path("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"))
12+
os.add_dll_directory(Path("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"))
13+
14+
print(sys.path)
15+
print(os.listdir(os.path.dirname(__file__)))
16+
print(Path("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"))
17+
print(Path("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"))
18+
19+
from adios2_bindings@ADIOS2_LIBRARY_SUFFIX@ import *
220

321
__version__ = "@ADIOS2_VERSION@"

cmake/ADIOSFunctions.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,11 @@ function(python_add_test)
8888
"PYTHONPATH=${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}:$ENV{PYTHONPATH}"
8989
)
9090
else()
91+
file(TO_NATIVE_PATH "<path>" <variable>)
9192
set_property(TEST ${ARGS_NAME} PROPERTY
9293
ENVIRONMENT
93-
"PYTHONPATH=${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR};$ENV{PYTHONPATH}"
94-
"PATH=$<TARGET_FILE_DIR:adios2_py>;$ENV{PATH}"
94+
"PYTHONPATH=${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR};$<SHELL_PATH:$<TARGET_FILE_DIR:adios2_py>>;$ENV{PYTHONPATH}"
95+
"PATH=$<SHELL_PATH:$<TARGET_FILE_DIR:adios2_py>>;$<SHELL_PATH:$<TARGET_FILE_DIR:adios2_core>>;$ENV{PATH}"
9596
)
9697
endif()
9798
endfunction()

scripts/ci/cmake/ci-win2022-vs2022-serial.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ADIOS2_USE_BZip2:BOOL=OFF
1414
ADIOS2_USE_Fortran:BOOL=OFF
1515
ADIOS2_USE_MPI:BOOL=OFF
1616
ADIOS2_USE_HDF5:STRING=ON
17-
ADIOS2_USE_Python:BOOL=OFF
17+
ADIOS2_USE_Python:BOOL=ON
1818
ADIOS2_USE_HDF5_VOL:STRING=OFF
1919
HDF5_ROOT:PATH=C:/hdf5/HDF5-1.14.2.1-win64
2020
")

scripts/ci/gh-actions/windows-setup.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ conda.bat init powershell
1414
conda.bat init bash
1515
Write-Host "::endgroup::"
1616

17+
Write-Host "::group::Installing numpy"
18+
conda.bat install -y anaconda::numpy
19+
Write-Host "::endgroup::"
20+
1721
Write-Host "::group::Installing c-blosc2"
1822
conda.bat install -y conda-forge::c-blosc2
1923
Write-Host "::endgroup::"

0 commit comments

Comments
 (0)