Remove extra code and format

Author: reeselevine

ggml/include/ggml.h

@@ -225,13 +225,7 @@
 #   define GGML_MAX_NAME        64
 #endif
 
-// For single-thread WASM builds, only use 1 thread
-#if !defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__)
 #define GGML_DEFAULT_N_THREADS  4
-#else
-#define GGML_DEFAULT_N_THREADS  1
-#endif
-
 #define GGML_DEFAULT_GRAPH_SIZE 2048
 
 #if UINTPTR_MAX == 0xFFFFFFFF

ggml/src/ggml-cpu/ggml-cpu.cpp

@@ -246,11 +246,8 @@ bool ggml_backend_is_cpu(ggml_backend_t backend) {
 void ggml_backend_cpu_set_n_threads(ggml_backend_t backend_cpu, int n_threads) {
     GGML_ASSERT(ggml_backend_is_cpu(backend_cpu));
 
-// For single-thread WASM builds, do not allow changing the number of threads
-#if !defined(_EMSCRIPTEN_) || defined(__EMSCRIPTEN_PTHREADS__)
     struct ggml_backend_cpu_context * ctx = (struct ggml_backend_cpu_context *)backend_cpu->context;
     ctx->n_threads = n_threads;
-#endif
 }
 
 void ggml_backend_cpu_set_threadpool(ggml_backend_t backend_cpu, ggml_threadpool_t threadpool) {
@@ -625,14 +622,10 @@ static ggml_backend_feature * ggml_backend_cpu_get_features(ggml_backend_reg_t r
 }
 
 static void * ggml_backend_cpu_get_proc_address(ggml_backend_reg_t reg, const char * name) {
-
-// For single-thread WASM builds, do not expose a set_n_threads function
-#if !defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__)
     if (strcmp(name, "ggml_backend_set_n_threads") == 0) {
         ggml_backend_set_n_threads_t fct = ggml_backend_cpu_set_n_threads;
         return (void *)fct;
     }
-#endif
     if (strcmp(name, "ggml_backend_dev_get_extra_bufts") == 0) {
         ggml_backend_dev_get_extra_bufts_t fct = ggml_backend_cpu_device_get_extra_buffers_type;
         return (void *)fct;

ggml/src/ggml-webgpu/ggml-webgpu.cpp

@@ -1005,19 +1005,20 @@ static webgpu_command ggml_webgpu_unary_op(webgpu_context & ctx, ggml_tensor * s
     };
 
     switch (unary_op) {
-        case GGML_UNARY_OP_XIELU: {
-            // Get float parameters and reinterpret their bit patterns as uint32_t
-            // for passing through the params buffer
-            float alpha_n = ggml_get_op_params_f32(dst, 1);
-            float alpha_p = ggml_get_op_params_f32(dst, 2);
-            float beta = ggml_get_op_params_f32(dst, 3);
-            float eps = ggml_get_op_params_f32(dst, 4);
-            params.push_back(*reinterpret_cast<const uint32_t *>(&alpha_n));
-            params.push_back(*reinterpret_cast<const uint32_t *>(&alpha_p));
-            params.push_back(*reinterpret_cast<const uint32_t *>(&beta));
-            params.push_back(*reinterpret_cast<const uint32_t *>(&eps));
-            break;
-        }
+        case GGML_UNARY_OP_XIELU:
+            {
+                // Get float parameters and reinterpret their bit patterns as uint32_t
+                // for passing through the params buffer
+                float alpha_n = ggml_get_op_params_f32(dst, 1);
+                float alpha_p = ggml_get_op_params_f32(dst, 2);
+                float beta    = ggml_get_op_params_f32(dst, 3);
+                float eps     = ggml_get_op_params_f32(dst, 4);
+                params.push_back(*reinterpret_cast<const uint32_t *>(&alpha_n));
+                params.push_back(*reinterpret_cast<const uint32_t *>(&alpha_p));
+                params.push_back(*reinterpret_cast<const uint32_t *>(&beta));
+                params.push_back(*reinterpret_cast<const uint32_t *>(&eps));
+                break;
+            }
         default:
             break;
     }

tests/test-backend-ops.cpp

@@ -47,12 +47,6 @@
 #   define N_THREADS std::thread::hardware_concurrency()
 #endif
 
-#ifdef __EMSCRIPTEN__
-#   define N_THREADS 1
-#else
-#   define N_THREADS std::thread::hardware_concurrency()
-#endif
-
 static void init_tensor_uniform(ggml_tensor * tensor, float min = -1.0f, float max = 1.0f) {
     size_t nels = ggml_nelements(tensor);
     std::vector<float> data(nels);