Merge previous changes

include/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(triton/ir)
+add_subdirectory(triton/Dialect)

include/triton/Dialect/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(Triton)

include/triton/Dialect/Triton/Dialect.h

@@ -1,7 +1,6 @@
 #ifndef TRITON_IR_DIALECT_H_
 #define TRITON_IR_DIALECT_H_
 
-#include "triton/ir/Traits.h"
 
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Dialect.h"
@@ -9,11 +8,11 @@
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Dialect/SCF/SCF.h"
 
-#include "triton/ir/Dialect.h.inc"
-
-#include "triton/ir/OpsEnums.h.inc"
+#include "triton/Dialect/Triton/Traits.h"
+#include "triton/Dialect/Triton/Dialect.h.inc"
+#include "triton/Dialect/Triton/OpsEnums.h.inc"
 
 #define GET_OP_CLASSES
-#include "triton/ir/Ops.h.inc"
+#include "triton/Dialect/Triton/Ops.h.inc"
 
 #endif // TRITON_IR_DIALECT_H_

include/triton/Dialect/Triton/Types.h

@@ -5,6 +5,6 @@
 #include "mlir/IR/Types.h"
 
 #define GET_TYPEDEF_CLASSES
-#include "triton/ir/Types.h.inc"
+#include "triton/Dialect/Triton/Types.h.inc"
 
 #endif // TRITON_IR_TYPES_H_

include/triton/driver/error.h

@@ -19,7 +19,8 @@ namespace triton
   namespace nvrtc
   {
 
-#define TRITON_CREATE_NVRTC_EXCEPTION(name, msg) class name: public std::exception { public: const char * what() const throw(){ return "NVRTC: Error- " msg; } }
+#define TRITON_CREATE_NVRTC_EXCEPTION(name, msg) \
+class name: public std::exception { public: const char * what() const throw() override { return "NVRTC: Error- " msg; } }
 
   TRITON_CREATE_NVRTC_EXCEPTION(out_of_memory              ,"out of memory");
   TRITON_CREATE_NVRTC_EXCEPTION(program_creation_failure   ,"program creation failure");
@@ -38,7 +39,8 @@ namespace triton
   {
   class base: public std::exception{};
 
-#define TRITON_CREATE_CUDA_EXCEPTION(name, msg) class name: public base { public:const char * what() const throw(){ return "CUDA: Error- " msg; } }
+#define TRITON_CREATE_CUDA_EXCEPTION(name, msg) \
+class name: public base { public:const char * what() const throw() override { return "CUDA: Error- " msg; } }
 
 
   TRITON_CREATE_CUDA_EXCEPTION(invalid_value                   ,"invalid value");
@@ -106,7 +108,8 @@ namespace triton
   {
   class base: public std::exception{};
 
-#define TRITON_CREATE_CUBLAS_EXCEPTION(name, msg) class name: public base { public: const char * what() const throw(){ return "CUBLAS: Error- " msg; } }
+#define TRITON_CREATE_CUBLAS_EXCEPTION(name, msg) \
+class name: public base { public: const char * what() const throw() override { return "CUBLAS: Error- " msg; } }
 
   TRITON_CREATE_CUBLAS_EXCEPTION(not_initialized              ,"not initialized");
   TRITON_CREATE_CUBLAS_EXCEPTION(alloc_failed                 ,"alloc failed");
@@ -124,7 +127,8 @@ namespace triton
 
   namespace cudnn
   {
-#define TRITON_CREATE_CUDNN_EXCEPTION(name, msg) class name: public std::exception { public: const char * what() const throw(){ return "CUDNN: Error- " msg; } }
+#define TRITON_CREATE_CUDNN_EXCEPTION(name, msg) \
+class name: public std::exception { public: const char * what() const throw() override { return "CUDNN: Error- " msg; } }
 
   TRITON_CREATE_CUDNN_EXCEPTION(not_initialized              ,"not initialized");
   TRITON_CREATE_CUDNN_EXCEPTION(alloc_failed                 ,"allocation failed");
@@ -148,7 +152,8 @@ namespace triton
   {
   class base: public std::exception{};
 
-#define TRITON_CREATE_HIP_EXCEPTION(name, msg) class name: public base { public:const char * what() const throw(){ return "HIP: Error- " msg; } }
+#define TRITON_CREATE_HIP_EXCEPTION(name, msg) \
+class name: public base { public:const char * what() const throw() override { return "HIP: Error- " msg; } }
 
 
   TRITON_CREATE_HIP_EXCEPTION(invalid_value                   ,"invalid value");