Merge pull request #3938 from vicentebolea/add-new-python-api (3f91c411) · Commits · ecpcitest / ADIOS2

flake8.cfg→.flake8

+0 −0

File moved.

.github/workflows/everything.yml

+7 −1

Original line number	Diff line number	Diff line
		@@ -90,9 +90,15 @@ jobs:
		- name: CXX
		working-directory: source
		run: ../gha/scripts/ci/scripts/run-clang-format.sh
		- name: Python
		- name: Python flake8
		working-directory: source
		run: ../gha/scripts/ci/scripts/run-flake8.sh
		- name: Python pylint
		working-directory: source
		run: ../gha/scripts/ci/scripts/run-pylint.sh
		- name: Python black
		working-directory: source
		run: ../gha/scripts/ci/scripts/run-black.sh
		- name: Shell
		working-directory: source
		run: ../gha/scripts/ci/scripts/run-shellcheck.sh

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,3 +40,7 @@ docs/pyvenv.cfg
		# Visual Studio
		.vs/
		CMakeSettings.json

		# Python wheels stuff

		*.egg-info/

CMakeLists.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -329,6 +329,13 @@ add_subdirectory(source)
		#------------------------------------------------------------------------------#
		add_subdirectory(bindings)

		#------------------------------------------------------------------------------#
		# Language Libraries
		#------------------------------------------------------------------------------#
		if(ADIOS2_HAVE_Python)
		add_subdirectory(python)
		endif()

		#------------------------------------------------------------------------------#
		# Plugins
		#------------------------------------------------------------------------------#
		@@ -342,6 +349,7 @@ if(ADIOS2_BUILD_EXAMPLES)
		add_subdirectory(examples)
		endif()


		#------------------------------------------------------------------------------#
		# Testing
		#------------------------------------------------------------------------------#

bindings/Python/CMakeLists.txt

+20 −24

Original line number	Diff line number	Diff line
		@@ -7,14 +7,12 @@ Python_add_library(adios2_py MODULE
		py11Engine.cpp
		py11Operator.cpp
		py11Query.cpp
		py11File.cpp py11File.tcc
		py11glue.cpp
		)
		target_compile_definitions(adios2_py PRIVATE "ADIOS2_PYTHON_MODULE_NAME=adios2${ADIOS2_LIBRARY_SUFFIX}")
		target_compile_definitions(adios2_py PRIVATE "ADIOS2_PYTHON_MODULE_NAME=adios2_bindings${ADIOS2_LIBRARY_SUFFIX}")
		if(ADIOS2_HAVE_MPI)
		target_sources(adios2_py PRIVATE
		py11ADIOSMPI.cpp
		py11FileMPI.cpp
		py11IOMPI.cpp
		)
		set(maybe_adios2_cxx11_mpi adios2_cxx11_mpi)
		@@ -29,44 +27,42 @@ target_link_libraries(adios2_py PRIVATE
		${maybe_adios2_cxx11_mpi} adios2_cxx11
		${maybe_adios2_core_mpi} adios2_core
		adios2::thirdparty::pybind11
		${maybe_mpi4py} Python::NumPy
		${maybe_mpi4py}
		)
		configure_file(
		${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in
		${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/__init__.py
		${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings/__init__.py
		@ONLY
		)

		set_target_properties(adios2_py PROPERTIES
		CXX_VISIBILITY_PRESET hidden
		OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFFIX}
		ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2
		LIBRARY_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2
		RUNTIME_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2
		PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2
		COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2
		OUTPUT_NAME adios2_bindings${ADIOS2_LIBRARY_SUFFIX}
		ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
		LIBRARY_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
		RUNTIME_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
		PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
		COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings
		)

		string(REGEX REPLACE "[^/]+" ".." relative_base "${CMAKE_INSTALL_PYTHONDIR}/adios2")
		set(install_location "${CMAKE_INSTALL_PYTHONDIR}/adios2")
		if (ADIOS2_USE_PIP)
		set(install_location ${CMAKE_INSTALL_LIBDIR})
		endif()

		string(REGEX REPLACE "[^/]+" ".." relative_base "${install_location}/bindings")
		if(CMAKE_SYSTEM_NAME MATCHES "Linux")
		if (NOT ADIOS2_USE_PIP)
		set_target_properties(adios2_py PROPERTIES
		set_property(TARGET adios2_py APPEND PROPERTY
		INSTALL_RPATH "$ORIGIN/${relative_base}/${CMAKE_INSTALL_LIBDIR}"
		)
		endif()
		endif()

		set(install_location ${CMAKE_INSTALL_PYTHONDIR})
		if (ADIOS2_USE_PIP)
		set(install_location ${CMAKE_INSTALL_LIBDIR})
		endif()

		install(TARGETS adios2_py
		DESTINATION ${install_location}
		DESTINATION ${install_location}/bindings
		COMPONENT adios2_python-python
		)
		install(FILES ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/__init__.py
		DESTINATION ${install_location}
		install(FILES ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/adios2/bindings/__init__.py
		DESTINATION ${install_location}/bindings
		COMPONENT adios2_python-python
		)
		install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test

Admin message