"docs/git@developer.sourcefind.cn:zhaoyu6/sglang.git" did not exist on "a25e8e42eb657c6a34ae67fc1fe69a19a5bef1be"
Commit 9b3c4ac4 authored by Jun Liu's avatar Jun Liu
Browse files

Merge branch 'develop' into amd-develop

parents 1d784873 7843a8a7
...@@ -65,7 +65,7 @@ set -- "${POSITIONAL[@]}" # restore positional parameters ...@@ -65,7 +65,7 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
# NUMACTL="numactl --cpunodebind=1 --membind=1" # NUMACTL="numactl --cpunodebind=1 --membind=1"
NUMACTL= NUMACTL=
# ENV_CONF= # ENV_CONF=
GPU=mi100 GPU=gfx908
PROF_ITER_COUNT=10000 PROF_ITER_COUNT=10000
LOG_DIR_PATH=../log/${LOG_DIR} LOG_DIR_PATH=../log/${LOG_DIR}
set -x set -x
......
...@@ -264,5 +264,7 @@ TYPED_TEST(TestGroupedConvndBwdWeight3d, Test3D) ...@@ -264,5 +264,7 @@ TYPED_TEST(TestGroupedConvndBwdWeight3d, Test3D)
{3, 1, 1, 64, 3, {3, 3, 3}, {32, 32, 32}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}}); {3, 1, 1, 64, 3, {3, 3, 3}, {32, 32, 32}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}});
this->conv_params.push_back( this->conv_params.push_back(
{3, 1, 1, 1, 1, {3, 3, 3}, {32, 32, 32}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}}); {3, 1, 1, 1, 1, {3, 3, 3}, {32, 32, 32}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}});
this->conv_params.push_back(
{3, 1, 1, 4, 4, {3, 3, 3}, {14, 28, 28}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}});
this->Run(); this->Run();
} }
...@@ -55,14 +55,14 @@ class TestGroupedConvndBwdWeight : public ::testing::Test ...@@ -55,14 +55,14 @@ class TestGroupedConvndBwdWeight : public ::testing::Test
} }
} }
if(ck::is_navi3_supported()) if(ck::is_gfx11_supported())
{ {
// on navi3x only support for 3d is implemented // on gfx11 only support for 3d is implemented
if constexpr(NDimSpatial{} != 3) if constexpr(NDimSpatial{} != 3)
{ {
return true; return true;
} }
// on navi3x only support for i8 and fp16 is implemented // on gfx11 only support for i8 and fp16 is implemented
if constexpr(!((std::is_same_v<InDataType, int8_t> && if constexpr(!((std::is_same_v<InDataType, int8_t> &&
std::is_same_v<WeiDataType, int8_t> && std::is_same_v<WeiDataType, int8_t> &&
std::is_same_v<OutDataType, int8_t>) || std::is_same_v<OutDataType, int8_t>) ||
...@@ -80,7 +80,7 @@ class TestGroupedConvndBwdWeight : public ::testing::Test ...@@ -80,7 +80,7 @@ class TestGroupedConvndBwdWeight : public ::testing::Test
} }
else else
{ {
// support for i8 is only implemented on navi3x // support for i8 is only implemented on gfx11
if constexpr(std::is_same_v<InDataType, int8_t> && if constexpr(std::is_same_v<InDataType, int8_t> &&
std::is_same_v<WeiDataType, int8_t> && std::is_same_v<OutDataType, int8_t>) std::is_same_v<WeiDataType, int8_t> && std::is_same_v<OutDataType, int8_t>)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment