Skip to content

Remove wrong dependency between TritonGPU and NVGPU dialect #2276

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
ThomasRaoux merged 2 commits into from
Sep 11, 2023
Merged

Remove wrong dependency between TritonGPU and NVGPU dialect #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1496644
Remove wrong dependency between between TritonGPU and NVGPU dialect
ThomasRaoux Sep 11, 2023
28499d5
Try to fix cross_entropy test
ThomasRaoux Sep 11, 2023
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
3 changes: 2 additions & 1 deletion bin/RegisterTritonDialects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ inline void registerTritonDialects(mlir::DialectRegistry &registry) {
mlir::triton::nvidia_gpu::TritonNvidiaGPUDialect,
mlir::triton::gpu::TritonGPUDialect, mlir::math::MathDialect,
mlir::arith::ArithDialect, mlir::scf::SCFDialect,
mlir::gpu::GPUDialect>();
mlir::gpu::GPUDialect, mlir::LLVM::LLVMDialect,
mlir::triton::nvgpu::NVGPUDialect>();
}
1 change: 0 additions & 1 deletion include/triton/Dialect/TritonGPU/IR/Dialect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "mlir/IR/Dialect.h"

// TritonGPU depends on Triton
#include "triton/Dialect/NVGPU/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/TritonGPU/IR/Attributes.h"
#include "triton/Dialect/TritonGPU/IR/Dialect.h.inc"
Expand Down
1 change: 0 additions & 1 deletion include/triton/Dialect/TritonGPU/IR/TritonGPUDialect.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ def TritonGPU_Dialect : Dialect {

let dependentDialects = [
"triton::TritonDialect",
"mlir::triton::nvgpu::NVGPUDialect",
"mlir::gpu::GPUDialect",
"tensor::TensorDialect",
];
Expand Down
1 change: 1 addition & 0 deletions lib/Conversion/TritonGPUToLLVM/Utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "triton/Analysis/Utility.h"
#include "triton/Conversion/MLIRTypes.h"
#include "triton/Conversion/TritonGPUToLLVM/PTXAsmFormat.h"
#include "triton/Dialect/NVGPU/IR/Dialect.h"

// Shortcuts for some commonly used LLVM ops to keep code simple and intuitive
// Operators
Expand Down
1 change: 1 addition & 0 deletions lib/Dialect/NVGPU/IR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ add_mlir_dialect_library(NVGPUIR
NVGPUAttrDefsIncGen

LINK_LIBS PUBLIC
MLIRLLVMDialect
)
6 changes: 4 additions & 2 deletions python/test/unit/operators/test_cross_entropy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ def test_op(M, N, dtype, mode):
x.grad = None
th_y.backward(dy)
th_dx = x.grad.clone()

torch.testing.assert_close(th_dx, tt_dx)
if dtype == 'float16':
torch.testing.assert_close(th_dx, tt_dx, rtol=0.001, atol=0.001)
else:
torch.testing.assert_close(th_dx, tt_dx)
1 change: 1 addition & 0 deletions unittest/Conversion/TritonGPUToLLVM/EmitIndicesTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/

#include "mlir/Dialect/GPU/IR/GPUDialect.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"

#include "DumpLayout.h"

Expand Down