Fix cross-platform compatibility for environment variable handling

- Add portable setenv/unsetenv macros for Windows (_putenv_s)
- Replace all setenv/unsetenv calls with portable versions
- Fix trailing whitespace issues for editorconfig compliance

This fixes Windows and macOS build failures caused by POSIX-only functions.

Co-Authored-By: Alex Peng <[email protected]>

Author: devin-ai-integration[bot]

ggml/src/ggml-alloc.c

@@ -84,7 +84,7 @@ static bool ggml_alloc_should_fail(size_t size) {
             return true;
         }
     }
-    
+
     const char * fail_count = getenv("GGML_ALLOC_FAIL_COUNT");
     if (fail_count) {
         static int alloc_count = 0;
@@ -93,7 +93,7 @@ static bool ggml_alloc_should_fail(size_t size) {
             return true;
         }
     }
-    
+
     return false;
 }
 

tests/test-invalid-inputs.cpp

@@ -8,6 +8,14 @@
 #include <string>
 #include <vector>
 
+#ifdef _WIN32
+    #define setenv_portable(name, value) _putenv_s(name, value)
+    #define unsetenv_portable(name) _putenv_s(name, "")
+#else
+    #define setenv_portable(name, value) setenv(name, value, 1)
+    #define unsetenv_portable(name) unsetenv(name)
+#endif
+
 enum invalid_input_scenario {
     INVALID_TENSOR_SHAPE_NEGATIVE = 1,
     INVALID_TENSOR_SHAPE_ZERO,
@@ -64,7 +72,7 @@ static bool test_invalid_input_scenario(enum invalid_input_scenario scenario) {
         case INVALID_TENSOR_SHAPE_MISMATCH: {
             ggml_tensor * a = ggml_new_tensor_2d(ctx, GGML_TYPE_F32, 10, 20);
             ggml_tensor * b = ggml_new_tensor_2d(ctx, GGML_TYPE_F32, 15, 25);
-            
+
             if (a && b) {
                 bool shapes_different = (a->ne[0] != b->ne[0]) || (a->ne[1] != b->ne[1]);
                 if (shapes_different) {
@@ -80,7 +88,7 @@ static bool test_invalid_input_scenario(enum invalid_input_scenario scenario) {
         case INVALID_TENSOR_TYPE_MISMATCH: {
             ggml_tensor * a = ggml_new_tensor_1d(ctx, GGML_TYPE_F32, 100);
             ggml_tensor * b = ggml_new_tensor_1d(ctx, GGML_TYPE_F16, 100);
-            
+
             if (a && b && a->type != b->type) {
                 printf("  - \033[1;32mOK\033[0m: type mismatch detected\n");
                 test_passed = true;
@@ -105,7 +113,7 @@ static bool test_invalid_input_scenario(enum invalid_input_scenario scenario) {
         case INVALID_OPERATION_INCOMPATIBLE: {
             ggml_tensor * a = ggml_new_tensor_1d(ctx, GGML_TYPE_F32, 100);
             ggml_tensor * b = ggml_new_tensor_2d(ctx, GGML_TYPE_F32, 10, 20);
-            
+
             if (a && b) {
                 bool incompatible = (a->ne[1] != b->ne[1]) || (a->ne[0] != 100 && b->ne[0] != 10);
                 if (incompatible) {

tests/test-memory-exhaustion.cpp

@@ -8,6 +8,14 @@
 #include <string>
 #include <vector>
 
+#ifdef _WIN32
+    #define setenv_portable(name, value) _putenv_s(name, value)
+    #define unsetenv_portable(name) _putenv_s(name, "")
+#else
+    #define setenv_portable(name, value) setenv(name, value, 1)
+    #define unsetenv_portable(name) unsetenv(name)
+#endif
+
 enum memory_exhaustion_scenario {
     MEM_EXHAUST_SMALL_ALLOC = 1,
     MEM_EXHAUST_MEDIUM_ALLOC,
@@ -40,23 +48,23 @@ static bool test_memory_exhaustion_scenario(ggml_backend_t backend, enum memory_
 
     switch (scenario) {
         case MEM_EXHAUST_SMALL_ALLOC:
-            setenv("GGML_ALLOC_FAIL_THRESHOLD", "1024", 1);
+            setenv_portable("GGML_ALLOC_FAIL_THRESHOLD", "1024");
             break;
         case MEM_EXHAUST_MEDIUM_ALLOC:
-            setenv("GGML_ALLOC_FAIL_THRESHOLD", "1048576", 1);
+            setenv_portable("GGML_ALLOC_FAIL_THRESHOLD", "1048576");
             break;
         case MEM_EXHAUST_LARGE_ALLOC:
-            setenv("GGML_ALLOC_FAIL_THRESHOLD", "10485760", 1);
+            setenv_portable("GGML_ALLOC_FAIL_THRESHOLD", "10485760");
             break;
         case MEM_EXHAUST_MANY_ALLOCS:
-            setenv("GGML_ALLOC_FAIL_COUNT", "10", 1);
+            setenv_portable("GGML_ALLOC_FAIL_COUNT", "10");
             break;
         case MEM_EXHAUST_BUFFER_OVERFLOW:
-            setenv("GGML_ALLOC_FAIL_THRESHOLD", "100", 1);
+            setenv_portable("GGML_ALLOC_FAIL_THRESHOLD", "100");
             break;
         default:
-            unsetenv("GGML_ALLOC_FAIL_THRESHOLD");
-            unsetenv("GGML_ALLOC_FAIL_COUNT");
+            unsetenv_portable("GGML_ALLOC_FAIL_THRESHOLD");
+            unsetenv_portable("GGML_ALLOC_FAIL_COUNT");
             break;
     }
 
@@ -72,7 +80,7 @@ static bool test_memory_exhaustion_scenario(ggml_backend_t backend, enum memory_
     }
 
     ggml_tensor * a = nullptr;
-    
+
     switch (scenario) {
         case MEM_EXHAUST_SMALL_ALLOC:
             a = ggml_new_tensor_1d(ctx, GGML_TYPE_F32, 256);
@@ -124,9 +132,9 @@ static bool test_memory_exhaustion_scenario(ggml_backend_t backend, enum memory_
     }
 
     ggml_free(ctx);
-    
-    unsetenv("GGML_ALLOC_FAIL_THRESHOLD");
-    unsetenv("GGML_ALLOC_FAIL_COUNT");
+
+    unsetenv_portable("GGML_ALLOC_FAIL_THRESHOLD");
+    unsetenv_portable("GGML_ALLOC_FAIL_COUNT");
 
     return test_passed;
 }