Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions csrc/deepep/ops/op_host/fused_deep_moe_tiling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize(const char *nodeName)
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OPS_LOG_D(nodeName, "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (...) {
OPS_LOG_E(nodeName, "Unknown Exception encountered when parser env HCCL_BUFFERSIZE");
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops/op_host/mc2_tiling_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down
12 changes: 7 additions & 5 deletions csrc/deepep/ops2/op_host/cam_moe_combine_normal_tiling.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,20 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (...) {
OP_LOGE("", "Unknown Exception encountered when parser env HCCL_BUFFERSIZE");
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
} catch (const std::out_of_range &oor) {
OP_LOGE("", "Out of range when parsing HCCL_BUFFSIZE: %s", oor.what());
}
}
const uint64_t maxWindowSize = static_cast<uint64_t>(defaultWindowSize) * 1024UL * 1024UL;
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops2/op_host/cam_moe_dispatch_normal_tiling.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops2/op_host/dispatch_normal_a2_tiling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops2/op_host/mc2_tiling_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ constexpr uint32_t AICPU_BLOCK_DIM_A2 = 6U;
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops2/op_host/notify_dispatch_tiling.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down
6 changes: 3 additions & 3 deletions csrc/deepep/ops2/op_host/notify_dispatch_tiling_a2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ namespace {
class Mc2TilingUtils
{
public:
#define HCCL_BUFFSIZE "HCCL_BUFFSIZE"
static uint64_t GetMaxWindowSize()
{
uint16_t defaultWindowSize = 200;
if (getenv(HCCL_BUFFSIZE) == nullptr) {
const char *hcclBuffSize = getenv("DEEPEP_HCCL_BUFFSIZE") == nullptr ? "HCCL_BUFFSIZE" : "DEEPEP_HCCL_BUFFSIZE";
if (getenv(hcclBuffSize) == nullptr) {
OP_LOGD("", "Env HCCL_BUFFSIZE don't set");
} else {
try {
std::string envStr(getenv(HCCL_BUFFSIZE));
std::string envStr(getenv(hcclBuffSize));
defaultWindowSize = std::stoi(envStr);
} catch (const std::invalid_argument &ia) {
OP_LOGE("", "Invalid argument when parsing HCCL_BUFFSIZE: %s", ia.what());
Expand Down