gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GENERAL] Error messages now no longer make terminal color green

Browse Source
This commit is contained in:
Philippe Tillet
2020-04-03 23:25:29 -04:00
committed by Philippe Tillet
parent 3304629de9
commit 5943baa53f
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/codegen/analysis/layout.cc
View File

@@ -155,8 +155,8 @@ mma884_layout::mma884_layout(size_t num_warps,
unsigned effective_num_warps = 1; unsigned effective_num_warps = 1;
for(size_t d = 0; d < shape.size(); d++) for(size_t d = 0; d < shape.size(); d++)
effective_num_warps *= wpt_[d]; effective_num_warps *= wpt_[d];
if(num_warps != effective_num_warps) // if(num_warps != effective_num_warps)
throw std::runtime_error("cannot create a kernel with this amount of warps"); // throw std::runtime_error("cannot create a kernel with this amount of warps");
} }

2
lib/lang/ast.cc
View File

@@ -835,11 +835,9 @@ ArithmType* ConditionalOp::Convert() {
void ConditionalOp::TypeChecking() { void ConditionalOp::TypeChecking() {
auto condScalarType = TryExtractScalarType(this, cond_); auto condScalarType = TryExtractScalarType(this, cond_);
if (!condScalarType) { if (!condScalarType) {
Error(cond_->Tok(), "condition must be tile or scalar"); Error(cond_->Tok(), "condition must be tile or scalar");
} }
auto lhsType = TryExtractScalarType(this, exprTrue_); auto lhsType = TryExtractScalarType(this, exprTrue_);
auto rhsType = TryExtractScalarType(this, exprFalse_); auto rhsType = TryExtractScalarType(this, exprFalse_);
if (lhsType->ToArithm() && rhsType->ToArithm()) { if (lhsType->ToArithm() && rhsType->ToArithm()) {

2
lib/lang/error.cc
View File

@@ -62,7 +62,7 @@ static void VError(const SourceLocation& loc,
fprintf(stderr, "\n "); fprintf(stderr, "\n ");
for (unsigned i = 1; i + nspaces < loc.column_; ++i) for (unsigned i = 1; i + nspaces < loc.column_; ++i)
fputc(' ', stderr); fputc(' ', stderr);
fprintf(stderr, ANSI_COLOR_GREEN "^\n"); fprintf(stderr, "^\n");
exit(-1); exit(-1);
} }

3
lib/runtime/function.cc
View File

@@ -395,7 +395,8 @@ std::string function::preheader() {
#define __aligned(A) __attribute__((aligned(A))) #define __aligned(A) __attribute__((aligned(A)))
#define __multipleof(A) __attribute__((multipleof(A))) #define __multipleof(A) __attribute__((multipleof(A)))
#define INFINITY bitcast<float>(0x7F800000) #define F32_INFINITY bitcast<float>(0x7F800000)
#define F16_INFINITY bitcast<half>((int16)0x7C00)
extern int atomic_cas(int*, int, int); extern int atomic_cas(int*, int, int);
extern int atomic_xchg(int*, int); extern int atomic_xchg(int*, int);

2
python/setup.py
View File

@@ -14,7 +14,7 @@ import distutils.spawn
def find_llvm(): def find_llvm():
versions = ['','-9.0', '-9', '-90', '-8.0', '-8', '-80'] versions = ['-9.0', '-9', '-90', '-8.0', '-8', '-80', '']
supported = ['llvm-config{v}'.format(v=v) for v in versions] supported = ['llvm-config{v}'.format(v=v) for v in versions]
paths = [distutils.spawn.find_executable(cfg) for cfg in supported] paths = [distutils.spawn.find_executable(cfg) for cfg in supported]
paths = [p for p in paths if p is not None] paths = [p for p in paths if p is not None]