formatting

ginkgo-project · May 31, 2023 · a99f364 · a99f364
1 parent b78b6c5
commit a99f364
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git a/core/base/memory.cpp b/core/base/memory.cpp
@@ -56,4 +56,4 @@ void CpuAllocator::deallocate(void* ptr) const
 }
 
 
-}  // namespace gko
+}  // namespace gko
diff --git a/core/device_hooks/hip_hooks.cpp b/core/device_hooks/hip_hooks.cpp
@@ -36,12 +36,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <ginkgo/core/base/exception_helpers.hpp>
 #include <ginkgo/core/base/executor.hpp>
+#include <ginkgo/core/base/memory.hpp>
 #include <ginkgo/core/base/stream.hpp>
 #include <ginkgo/core/base/timer.hpp>
 #include <ginkgo/core/base/types.hpp>
 #include <ginkgo/core/base/version.hpp>
 #include <ginkgo/core/log/profiler_hook.hpp>
-#include "ginkgo/core/base/memory.hpp"
 
 
 namespace gko {

diff --git a/core/test/base/executor.cpp b/core/test/base/executor.cpp
@@ -35,7 +35,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <thread>
 #include <type_traits>
-#include "ginkgo/core/base/memory.hpp"
 
 
 #if defined(__unix__) || defined(__APPLE__)
@@ -47,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <ginkgo/core/base/exception.hpp>
+#include <ginkgo/core/base/memory.hpp>
 
 
 namespace {

diff --git a/cuda/base/device.cpp b/cuda/base/device.cpp
@@ -30,15 +30,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
-#include "cuda/base/device.hpp"
-
-
 #include <cuda_runtime.h>
 
 
 #include <ginkgo/core/base/exception_helpers.hpp>
 
 
+#include "cuda/base/device.hpp"
 #include "cuda/base/scoped_device_id.hpp"
 
 

diff --git a/cuda/base/memory.cpp b/cuda/base/memory.cpp
@@ -193,4 +193,4 @@ void CudaHostAllocator::deallocate(void* ptr) const
 }
 
 
-}  // namespace gko
+}  // namespace gko
diff --git a/cuda/base/nvtx.cpp b/cuda/base/nvtx.cpp
@@ -30,10 +30,12 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
+#include <cuda_runtime.h>
+
+
 #include <ginkgo/config.hpp>
 
 
-#include <cuda_runtime.h>
 #ifdef GKO_LEGACY_NVTX
 #include <nvToolsExt.h>
 #else

diff --git a/cuda/base/stream.cpp b/cuda/base/stream.cpp
@@ -30,11 +30,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
+#include <ginkgo/core/base/stream.hpp>
+
+
 #include <cuda_runtime.h>
 
 
 #include <ginkgo/core/base/exception_helpers.hpp>
-#include <ginkgo/core/base/stream.hpp>
 
 
 #include "cuda/base/scoped_device_id.hpp"

diff --git a/cuda/test/base/cuda_executor.cu b/cuda/test/base/cuda_executor.cu
@@ -44,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ginkgo/core/base/exception_helpers.hpp>
 #include <ginkgo/core/base/stream.hpp>
 
-
 #include "common/cuda_hip/base/executor.hpp.inc"
 #include "cuda/base/scoped_device_id.hpp"
 #include "cuda/test/utils.hpp"

diff --git a/hip/base/device.hip.cpp b/hip/base/device.hip.cpp
@@ -30,15 +30,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
-#include <ginkgo/core/base/stream.hpp>
+#include <ginkgo/core/base/device.hpp>
 
 
 #include <hip/hip_runtime.h>
 
 
 #include <ginkgo/config.hpp>
-#include <ginkgo/core/base/device.hpp>
 #include <ginkgo/core/base/exception_helpers.hpp>
+#include <ginkgo/core/base/stream.hpp>
 
 
 #include "hip/base/scoped_device_id.hip.hpp"

diff --git a/hip/base/roctx.hip.cpp b/hip/base/roctx.hip.cpp
@@ -30,10 +30,12 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
+#include <hip/hip_runtime.h>
+
+
 #include <ginkgo/config.hpp>
 
 
-#include <hip/hip_runtime.h>
 #if GINKGO_HIP_PLATFORM_HCC && GKO_HAVE_ROCTX
 #include <roctx.h>
 #endif

diff --git a/include/ginkgo/core/base/stream.hpp b/include/ginkgo/core/base/stream.hpp
@@ -121,4 +121,4 @@ class hip_stream {
 }  // namespace gko
 
 
-#endif  // GKO_PUBLIC_CORE_BASE_EXECUTOR_HPP_
+#endif  // GKO_PUBLIC_CORE_BASE_STREAM_HPP_