Merge rcm compile issue in Windows and MacOS

This fixes not-found omp local header and inheriting constructors not from direct base class. Related PR: #649
ginkgo-project · Oct 16, 2020 · 9dc9bc1 · 9dc9bc1
2 parents a0e1050 + 2202110
commit 9dc9bc1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/include/ginkgo/core/reorder/reordering_base.hpp b/include/ginkgo/core/reorder/reordering_base.hpp
@@ -144,9 +144,17 @@ public:                                                                        \
             _factory_name, ::gko::reorder::ReorderingBaseFactory>;             \
         friend class ::gko::enable_parameters_type<_parameters_name##_type,    \
                                                    _factory_name>;             \
-        using ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
-            _factory_name, _reordering_base,                                   \
-            _parameters_name##_type>::EnableDefaultReorderingBaseFactory;      \
+        explicit _factory_name(std::shared_ptr<const ::gko::Executor> exec)    \
+            : ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
+                  _factory_name, _reordering_base, _parameters_name##_type>(   \
+                  std::move(exec))                                             \
+        {}                                                                     \
+        explicit _factory_name(std::shared_ptr<const ::gko::Executor> exec,    \
+                               const _parameters_name##_type &parameters)      \
+            : ::gko::reorder::EnableDefaultReorderingBaseFactory<              \
+                  _factory_name, _reordering_base, _parameters_name##_type>(   \
+                  std::move(exec), parameters)                                 \
+        {}                                                                     \
     };                                                                         \
     friend ::gko::reorder::EnableDefaultReorderingBaseFactory<                 \
         _factory_name, _reordering_base, _parameters_name##_type>;             \

diff --git a/omp/reorder/rcm_kernels.cpp b/omp/reorder/rcm_kernels.cpp
@@ -54,10 +54,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ginkgo/core/matrix/sparsity_csr.hpp>
 
 
-#include "components/omp_mutex.hpp"
-#include "components/sort_small.hpp"
 #include "core/base/allocator.hpp"
 #include "core/components/prefix_sum.hpp"
+#include "omp/components/omp_mutex.hpp"
+#include "omp/components/sort_small.hpp"
 
 
 namespace gko {
@@ -872,4 +872,4 @@ GKO_INSTANTIATE_FOR_EACH_INDEX_TYPE(GKO_DECLARE_RCM_GET_PERMUTATION_KERNEL);
 }  // namespace rcm
 }  // namespace omp
 }  // namespace kernels
-}  // namespace gko
+}  // namespace gko