Skip to content

Commit b2f116a

Browse files
Use _depenv_s in dpnp/backend on Windows (#1452)
* Use _dupenv_s in dpnp backend for win32 * Remove --version argument for clang-format hook
1 parent 3f202cf commit b2f116a

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-5
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ repos:
4343
rev: v1.3.5
4444
hooks:
4545
- id: clang-format
46-
args: ["-i", "--version=12"]
46+
args: ["-i"]

dpnp/backend/src/memory_sycl.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,21 @@
3333
static bool use_sycl_device_memory()
3434
{
3535
// TODO need to move all getenv() into common dpnpc place
36-
const char *dpnpc_memtype_device =
37-
getenv("DPNPC_OUTPUT_DPARRAY_USE_MEMORY_DEVICE");
36+
char *dpnpc_memtype_device = nullptr;
37+
38+
#ifdef _WIN32
39+
size_t dpnpc_memtype_device_size = 0;
40+
_dupenv_s(&dpnpc_memtype_device, &dpnpc_memtype_device_size,
41+
"DPNPC_OUTPUT_DPARRAY_USE_MEMORY_DEVICE");
42+
#else
43+
dpnpc_memtype_device =
44+
std::getenv("DPNPC_OUTPUT_DPARRAY_USE_MEMORY_DEVICE");
45+
#endif
46+
3847
if (dpnpc_memtype_device != nullptr) {
48+
#ifdef _WIN32
49+
free(dpnpc_memtype_device);
50+
#endif
3951
return true;
4052
}
4153

dpnp/backend/src/verbose.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,24 @@ bool is_verbose_mode()
3333
{
3434
if (!_is_verbose_mode_init) {
3535
_is_verbose_mode = false;
36-
const char *env_var = std::getenv("DPNP_VERBOSE");
37-
if (env_var and env_var == std::string("1")) {
36+
char *env_var = nullptr;
37+
38+
#ifdef _WIN32
39+
size_t env_var_size = 0;
40+
_dupenv_s(&env_var, &env_var_size, "DPNP_VERBOSE");
41+
#else
42+
env_var = std::getenv("DPNP_VERBOSE");
43+
#endif
44+
45+
if (env_var && std::string(env_var) == "1") {
3846
_is_verbose_mode = true;
3947
}
4048
_is_verbose_mode_init = true;
49+
50+
#ifdef _WIN32
51+
if (env_var != nullptr)
52+
free(env_var);
53+
#endif
4154
}
4255
return _is_verbose_mode;
4356
}

0 commit comments

Comments
 (0)