Skip to content

Fixed cupy check for unit tests, default constructors, and file IO #419

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.

Sign up for GitHub

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

Merged
cliffburdick merged 1 commit into from
May 23, 2023
Merged

Fixed cupy check for unit tests, default constructors, and file IO #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ if (MATX_EN_FILEIO OR MATX_EN_VISUALIZATION OR MATX_EN_PYBIND11 OR MATX_BUILD_EX
# Check for python libs
include(cmake/CheckPythonLibs.cmake)
check_python_libs("numpy")
check_optional_python_libs("cupy")

# Required by pybind
# https://pybind11.readthedocs.io/en/stable/faq.html#someclass-declared-with-greater-
Expand Down
18 changes: 18 additions & 0 deletions cmake/CheckPythonLibs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,24 @@ function(check_python_libs)
if (NOT ${EXIT_CODE} EQUAL 0)
message(FATAL_ERROR
"The ${pack} Python3 package is not installed. Please install it using the following command: \"pip3 install ${pack}\".")
else()
set(${pack}_PYTHON_PACKAGE 1 PARENT_SCOPE)
endif()
endforeach ()
endfunction()

function(check_optional_python_libs)
foreach (pack IN LISTS ARGN)
message(STATUS "checking python import module ${pack}")
set(CMD "import ${pack}")

execute_process(COMMAND ${Python3_EXECUTABLE} -c ${CMD} RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET)
if (NOT ${EXIT_CODE} EQUAL 0)
message(STATUS
"The optional python package ${pack} package is not installed. Some unit tests and functionality may not work")
else()
set(${pack}_PYTHON_PACKAGE 1 PARENT_SCOPE)
endif()
endforeach ()
endfunction()

8 changes: 4 additions & 4 deletions include/matx/core/iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ struct RandomOperatorIterator {
using iterator_category = std::random_access_iterator_tag;
using difference_type = index_t;

__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorIterator(const RandomOperatorIterator &) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorIterator(RandomOperatorIterator &&) = default;
__MATX_INLINE__ RandomOperatorIterator(const RandomOperatorIterator &) = default;
__MATX_INLINE__ RandomOperatorIterator(RandomOperatorIterator &&) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorIterator(const OperatorType &t) : t_(t), offset_(0) { }
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorIterator(OperatorType &&t) : t_(t), offset_(0) { }
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorIterator(const OperatorType &t, stride_type offset) : t_(t), offset_(offset) {}
Expand Down Expand Up @@ -184,8 +184,8 @@ struct RandomOperatorOutputIterator {
using iterator_category = std::random_access_iterator_tag;
using difference_type = index_t;

__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorOutputIterator(RandomOperatorOutputIterator &&) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorOutputIterator(const RandomOperatorOutputIterator &) = default;
__MATX_INLINE__ RandomOperatorOutputIterator(RandomOperatorOutputIterator &&) = default;
__MATX_INLINE__ RandomOperatorOutputIterator(const RandomOperatorOutputIterator &) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorOutputIterator(OperatorType &&t) : t_(t), offset_(0) { }
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorOutputIterator(const OperatorType &t) : t_(t), offset_(0) { }
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ RandomOperatorOutputIterator(const OperatorType &t, stride_type offset) : t_(t), offset_(offset) {}
Expand Down
8 changes: 4 additions & 4 deletions include/matx/core/tensor_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ class tensor_impl_t {
// Type specifier for signaling this is a matx operation
using matxop = bool;

__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ tensor_impl_t(const tensor_impl_t &) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ tensor_impl_t(tensor_impl_t &&) = default;
__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ tensor_impl_t& operator=(tensor_impl_t &&) = default;
__MATX_INLINE__ tensor_impl_t(const tensor_impl_t &) = default;
__MATX_INLINE__ tensor_impl_t(tensor_impl_t &&) = default;
__MATX_INLINE__ tensor_impl_t& operator=(tensor_impl_t &&) = default;


__MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ ~tensor_impl_t() = default;
__MATX_INLINE__ ~tensor_impl_t() = default;


const std::string str() const {
Expand Down
12 changes: 12 additions & 0 deletions test/01_radar/ambgfun.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ protected:
std::unique_ptr<detail::MatXPybind> pb;
};

#ifdef CUPY_INSTALLED
TEST_F(RadarAmbiguityFunction, Cut2D)
#else
TEST_F(RadarAmbiguityFunction, DISABLED_Cut2D)
#endif
{
MATX_ENTER_HANDLER();

Expand All @@ -71,7 +75,11 @@ TEST_F(RadarAmbiguityFunction, Cut2D)
MATX_EXIT_HANDLER();
}

#ifdef CUPY_INSTALLED
TEST_F(RadarAmbiguityFunction, CutDelay)
#else
TEST_F(RadarAmbiguityFunction, DISABLED_CutDelay)
#endif
{
MATX_ENTER_HANDLER();

Expand All @@ -86,7 +94,11 @@ TEST_F(RadarAmbiguityFunction, CutDelay)
MATX_EXIT_HANDLER();
}

#ifdef CUPY_INSTALLED
TEST_F(RadarAmbiguityFunction, CutDoppler)
#else
TEST_F(RadarAmbiguityFunction, DISABLED_CutDoppler)
#endif
{
MATX_ENTER_HANDLER();

Expand Down
28 changes: 28 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@ set (test_sources
main.cu
)

# Some of <00_io> tests need csv files and the binary 'test.mat' which all
# are located under 'CMAKE_SOURCE_DIR/test/00_io'. When calling the test
# executable <matx_test> from its location in 'CMAKE_BINARY_DIR/test' the
# search paths according <FileIOTests.cu> are
# '../test/00_io/small_csv_comma_nh.csv' and
# '../test/00_io/small_csv_complex_comma_nh.csv' respectively. Therefore
# they must be copied to the correct location:
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test/00_io)
file(COPY_FILE
${CMAKE_SOURCE_DIR}/test/00_io/small_csv_comma_nh.csv
${CMAKE_BINARY_DIR}/test/00_io/small_csv_comma_nh.csv
ONLY_IF_DIFFERENT
)
file(COPY_FILE
${CMAKE_SOURCE_DIR}/test/00_io/small_csv_complex_comma_nh.csv
${CMAKE_BINARY_DIR}/test/00_io/small_csv_complex_comma_nh.csv
ONLY_IF_DIFFERENT
)
file(COPY_FILE
${CMAKE_SOURCE_DIR}/test/00_io/test.mat
${CMAKE_BINARY_DIR}/test/00_io/test.mat
ONLY_IF_DIFFERENT
)

# Find proprietary parameters
file (GLOB_RECURSE proprietary_sources ../proprietary/*/tests/*.cu)
foreach (ptest ${proprietary_sources})
Expand All @@ -50,6 +74,10 @@ add_executable(matx_test main.cu ${all_test_srcs})
# Set all the flags/other properties
set_property(TARGET matx_test PROPERTY ENABLE_EXPORTS 1)

if (DEFINED cupy_PYTHON_PACKAGE)
target_compile_definitions(matx_test PRIVATE CUPY_INSTALLED)
endif()

if (MSVC)
target_compile_options(matx_test PRIVATE /W4 /WX)
else()
Expand Down