Skip to content

Use constexpr for array lengths in ExceptionWithCallstack #1036

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use constexpr for array lengths in ExceptionWithCallstack #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Implemented fully correct version of GELU instead of using bad approximatin via Swish.
- Handle copying from fp32 or fp16 embeddings in embedder mode correctly.
- Correct defaults for factored embeddings such that shared library use works (move out of config.h/cpp).
- Fixed builds where array lengths must be constexpr.

### Changed
- Globally set mkl_set_num_threads(1)
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/ExceptionWithCallStack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static void CollectCallStack(size_t skipLevels, bool makeFunctionNamesStandOut,

#else // Linux

unsigned int MAX_NUM_FRAMES = 1024;
constexpr unsigned int MAX_NUM_FRAMES = 1024;
void* backtraceAddresses[MAX_NUM_FRAMES];
unsigned int numFrames = backtrace(backtraceAddresses, MAX_NUM_FRAMES);
char** symbolList = backtrace_symbols(backtraceAddresses, numFrames);
Expand Down Expand Up @@ -234,7 +234,7 @@ static void CollectCallStack(size_t skipLevels, bool makeFunctionNamesStandOut,

// Mangled name is now in [beginName, beginOffset) and caller offset in [beginOffset, beginAddress).
int status = 0;
unsigned int MAX_FUNCNAME_SIZE = 4096;
constexpr unsigned int MAX_FUNCNAME_SIZE = 4096;
size_t funcNameSize = MAX_FUNCNAME_SIZE;
char funcName[MAX_FUNCNAME_SIZE]; // working buffer
const char* ret = abi::__cxa_demangle(beginName, funcName, &funcNameSize, &status);
Expand Down