Remove Fiji from CI and implemented merge findings
MODIFY
.gitlab-ci-gputest.yml
.gitlab-ci-gputest.yml
@@ -6,13 +6,14 @@ test:vega20:
- vega20
- rocm
-test:s9300:
- extends: .test
- dependencies:
- - build:rocm
- tags:
- - s9300
- - rocm
+# TODO: Disable Fiji
+# test:s9300:
+# extends: .test
+# dependencies:
+# - build:rocm
+# tags:
+# - s9300
+# - rocm
test:mi25:
extends: .test
@@ -21,4 +22,3 @@ test:mi25:
tags:
- mi25
- rocm
-

MODIFY
test/CMakeLists.txt
test/CMakeLists.txt
@@ -58,9 +58,9 @@ endfunction()
add_hipthrust_test("thrust.hip.allocator" test_allocator.cpp)
-add_hipthrust_test("thrust.hip.constant_iterator" test_constant_iterator.cpp)
# add_hipthrust_test("thrust.hip.complex_transform" test_complex_transform.cpp)
# add_hipthrust_test("thrust.hip.complex" test_complex.cpp)
+add_hipthrust_test("thrust.hip.constant_iterator" test_constant_iterator.cpp)
add_hipthrust_test("thrust.hip.copy_n" test_copy_n.cpp)
add_hipthrust_test("thrust.hip.copy" test_copy.cpp)
add_hipthrust_test("thrust.hip.count" test_count.cpp)
@@ -86,8 +86,8 @@ add_hipthrust_test("thrust.hip.replace" test_replace.cpp)
add_hipthrust_test("thrust.hip.scatter" test_scatter.cpp)
add_hipthrust_test("thrust.hip.sort" test_sort.cpp)
add_hipthrust_test("thrust.hip.tabulate" test_tabulate.cpp)
-add_hipthrust_test("thrust.hip.transform" test_transform.cpp)
add_hipthrust_test("thrust.hip.transform_reduce" test_transform_reduce.cpp)
+add_hipthrust_test("thrust.hip.transform" test_transform.cpp)
add_hipthrust_test("thrust.hip.tuple_reduce" test_tuple_reduce.cpp)
add_hipthrust_test("thrust.hip.tuple_sort" test_tuple_sort.cpp)
add_hipthrust_test("thrust.hip.tuple_transform" test_tuple_transform.cpp)

MODIFY
test/test_assertations.hpp
test/test_assertations.hpp
// Google Test
#include <gtest/gtest.h>
+// TODO: Fix the complex
//#include <thrust/complex.h>
template <typename T1, typename T2>
@@ -24,7 +25,7 @@ testing::AssertionResult CmpHelperEQQuite(const char* lhs_expression,
ASSERT_PRED_FORMAT2(CmpHelperEQQuite, \
val1, val2)
-
+// TODO: Fix the complex
/*template <typename T>
testing::AssertionResult ComplexNearPredFormat(const char* expr1,
const char* expr2,

MODIFY
test/test_tabulate.cpp
test/test_tabulate.cpp
@@ -149,23 +149,13 @@ TYPED_TEST(TabulateTests, TestTabulateSimple)
ASSERT_EQ(v[4], T(64));
}
-// TODO: Workaround for Fiji. Remove it later.
-std::vector<size_t> get_sizes_alternative()
-{
- std::vector<size_t> sizes = {
- 0, 1, 2, 12, 63, 64, 211, 256, 344,
- 999
- };
- return sizes;
-}
-
TYPED_TEST(TabulateTests, TestTabulate)
{
using Vector = typename TestFixture::input_type;
using T = typename Vector::value_type;
using namespace thrust::placeholders;
- for (auto size : get_sizes_alternative())
+ for (auto size : get_sizes())
{
SCOPED_TRACE(testing::Message() << "with size = " << size);

Remove Fiji from CI and implemented merge findings