Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 4 additions & 2 deletions cmake/ConfigureOpenGeode.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,16 @@ if(OPENGEODE_WITH_PYTHON OR INCLUDE_PYBIND11)
add_dependencies(download pybind11-download)
endif()

include(GNUInstallDirs)
add_custom_target(post_install
ALL
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/bin ${PROJECT_BINARY_DIR}/bin
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/lib ${PROJECT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/${CMAKE_INSTALL_LIBDIR} ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/cmake ${PROJECT_BINARY_DIR}/cmake
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/include ${PROJECT_BINARY_DIR}/include
COMMAND ${CMAKE_COMMAND} -E create_symlink ${OpenGeode_PATH_INSTALL}/share ${PROJECT_BINARY_DIR}/share
DEPENDS
opengeode)
opengeode
)

install(DIRECTORY ${OpenGeode_PATH_INSTALL}/ DESTINATION .)
2 changes: 1 addition & 1 deletion cmake/ConfigurePybind11.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExternalProject_Add(pybind11
BINARY_DIR ${PYBIND11_PATH}/build
STAMP_DIR ${PYBIND11_PATH}/stamp
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG v3.0.2
GIT_TAG v3.0.4
GIT_SHALLOW ON
GIT_PROGRESS ON
CMAKE_GENERATOR ${CMAKE_GENERATOR}
Expand Down
4 changes: 3 additions & 1 deletion cmake/OpenGeode.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ if(NOT BUILD_SHARED_LIBS)
endif()

if(OPENGEODE_WITH_PYTHON OR INCLUDE_PYBIND11)
find_package(pybind11 REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PYBIND11_INSTALL_PREFIX})
if(OPENGEODE_WITH_PYTHON)
find_package(pybind11 REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PYBIND11_INSTALL_PREFIX})
endif()
install(
DIRECTORY
${PYBIND11_INSTALL_PREFIX}/
Expand Down
2 changes: 1 addition & 1 deletion cmake/pyproject.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ name = "${GEODE_WHEEL_NAME}"
version = "${WHEEL_VERSION}"
description = "${GEODE_WHEEL_DESCRIPTION}"
authors = [{name = "Geode-solutions", email = "contact@geode-solutions.com"}]
requires-python = ">=3.9,<3.13"
requires-python = ">=3.10,<3.15"
license = {text = "${GEODE_WHEEL_LICENSE}"}
dynamic = ["dependencies", "readme"]

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/helpers/detail/component_identifier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
class Graph;
} // namespace geode

namespace geode

Check warning on line 41 in include/geode/mesh/helpers/detail/component_identifier.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/helpers/detail/component_identifier.hpp:41:1 [modernize-concat-nested-namespaces]

nested namespaces can be concatenated
{
namespace detail
{
Expand Down Expand Up @@ -90,7 +90,7 @@
template < index_t dimension >
class SurfaceIdentifier
{
OPENGEODE_DISABLE_COPY_AND_MOVE( SurfaceIdentifier< dimension > );
OPENGEODE_DISABLE_COPY_AND_MOVE( SurfaceIdentifier );

public:
explicit SurfaceIdentifier(
Expand Down
2 changes: 1 addition & 1 deletion src/geode/mesh/helpers/detail/component_identifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@

} // namespace

namespace geode

Check warning on line 62 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:62:1 [modernize-concat-nested-namespaces]

nested namespaces can be concatenated
{
namespace detail
{
template < typename Mesh >
class Propagator
{
OPENGEODE_DISABLE_COPY_AND_MOVE( Propagator< Mesh > );
OPENGEODE_DISABLE_COPY_AND_MOVE( Propagator );

public:
virtual ~Propagator() = default;

index_t identifier( index_t element ) const

Check warning on line 74 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:74:13 [modernize-use-nodiscard]

function 'identifier' should be marked [[nodiscard]]
{
OpenGeodeMeshException::check_assertion(
element < identification_.size(),
Expand All @@ -97,7 +97,7 @@
return nb_components_;
}

absl::FixedArray< std::vector< index_t > >

Check warning on line 100 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:100:13 [modernize-use-nodiscard]

function 'identified_components' should be marked [[nodiscard]]
identified_components() const
{
absl::FixedArray< std::vector< index_t > > components(
Expand All @@ -115,14 +115,14 @@
{
}

const Mesh& mesh() const

Check warning on line 118 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:118:13 [modernize-use-nodiscard]

function 'mesh' should be marked [[nodiscard]]
{
return mesh_;
}

private:
void propagate(
index_t element_from, index_t tag_id, index_t nb_max_elements )

Check warning on line 125 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:125:17 [bugprone-easily-swappable-parameters]

3 adjacent parameters of 'propagate' of similar type ('index_t') are easily swapped by mistake
{
index_t counter{ 0 };
std::queue< index_t > queue;
Expand All @@ -141,7 +141,7 @@
}
}

virtual void add_adjacents(

Check warning on line 144 in src/geode/mesh/helpers/detail/component_identifier.cpp

View workflow job for this annotation

GitHub Actions / test / tidy

src/geode/mesh/helpers/detail/component_identifier.cpp:144:26 [portability-template-virtual-member-function]

unspecified virtual member function instantiation; the virtual member function is not instantiated but it might be with a different compiler
index_t element_id, std::queue< index_t >& queue ) const = 0;

private:
Expand Down
Loading