Skip to content

[BACKEND] Remove dependency between NVGPU and TritonNvidiaGPU #2282

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 3 commits into from
Sep 12, 2023
Merged

[BACKEND] Remove dependency between NVGPU and TritonNvidiaGPU #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b53889
[BACKEND] Remove dependency between NVGPU and TritonNvidiaGPU
ThomasRaoux Sep 12, 2023
41ae8f6
Remove more headers included in the wrong place
ThomasRaoux Sep 12, 2023
9d0f884
Fix type
ThomasRaoux Sep 12, 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
1 change: 1 addition & 0 deletions bin/RegisterTritonDialects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
#include "triton/Dialect/NVGPU/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/TritonGPU/IR/Dialect.h"
#include "triton/Dialect/TritonNvidiaGPU/IR/Dialect.h"
Expand Down
1 change: 0 additions & 1 deletion include/triton/Dialect/TritonNvidiaGPU/IR/Dialect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "mlir/IR/Dialect.h"

// TritonNvidiaGPU depends on Triton
#include "triton/Dialect/NVGPU/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/TritonGPU/IR/Traits.h"
#include "triton/Dialect/TritonNvidiaGPU/IR/Dialect.h.inc"
Expand Down
1 change: 0 additions & 1 deletion include/triton/Dialect/TritonNvidiaGPU/IR/TritonNvidiaGPUDialect.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def TritonNvidiaGPU_Dialect : Dialect {
let dependentDialects = [
"triton::TritonDialect",
"triton::gpu::TritonGPUDialect",
"mlir::triton::nvgpu::NVGPUDialect",
"mlir::gpu::GPUDialect",
"tensor::TensorDialect",
];
Expand Down
1 change: 1 addition & 0 deletions lib/Conversion/NVGPUToLLVM/NVGPUToLLVMPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "mlir/Pass/Pass.h"
#include "mlir/Support/LogicalResult.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "triton/Dialect/NVGPU/IR/Dialect.h"

#include "triton/Conversion/TritonGPUToLLVM/PTXAsmFormat.h"

Expand Down
1 change: 1 addition & 0 deletions lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "Utility.h"
#include "mlir/IR/TypeUtilities.h"
#include "triton/Analysis/AxisInfo.h"
#include "triton/Dialect/NVGPU/IR/Dialect.h"
#include "triton/Dialect/TritonNvidiaGPU/IR/Dialect.h"
#include "triton/Target/PTX/TmaMetadata.h"
#include <set>
Expand Down
6 changes: 6 additions & 0 deletions lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "triton/Analysis/Allocation.h"
#include "triton/Analysis/AxisInfo.h"
#include "triton/Analysis/Membar.h"
#include "triton/Dialect/NVGPU/IR/Dialect.h"
#include "triton/Dialect/Triton/IR/Dialect.h"
#include "triton/Dialect/TritonGPU/IR/Dialect.h"
#include "triton/Dialect/TritonNvidiaGPU/IR/Dialect.h"
Expand Down Expand Up @@ -387,6 +388,11 @@ struct ConvertTritonGPUToLLVM
using ConvertTritonGPUToLLVMBase<
ConvertTritonGPUToLLVM>::ConvertTritonGPUToLLVMBase;

void getDependentDialects(DialectRegistry &registry) const override {
registry.insert<triton::nvgpu::NVGPUDialect, LLVM::LLVMDialect,
NVVM::NVVMDialect>();
}

ConvertTritonGPUToLLVM(int32_t computeCapability, Target target,
mlir::triton::gpu::TMAMetadataTy *tmaMetadata)
: ConvertTritonGPUToLLVMBase({computeCapability, target}),
Expand Down
1 change: 1 addition & 0 deletions lib/Conversion/TritonGPUToLLVM/Utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "Utility.h"
#include "TypeConverter.h"
#include "triton/Dialect/NVGPU/IR/Dialect.h"

namespace mlir {

Expand Down
1 change: 0 additions & 1 deletion lib/Conversion/TritonGPUToLLVM/Utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#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
2 changes: 1 addition & 1 deletion 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,7 +36,7 @@ def test_op(M, N, dtype, mode):
x.grad = None
th_y.backward(dy)
th_dx = x.grad.clone()
if dtype == 'float16':
if dtype == torch.float16:
torch.testing.assert_close(th_dx, tt_dx, rtol=0.001, atol=0.001)
else:
torch.testing.assert_close(th_dx, tt_dx)