@fugood/llama.node 1.0.0-beta.4 → 1.0.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/CMakeLists.txt +7 -4
  2. package/package.json +14 -14
package/CMakeLists.txt CHANGED
@@ -35,7 +35,7 @@ string(REPLACE "arm64x" "arm64" ARCH ${ARCH})
35
35
  string(REPLACE "aarch64" "arm64" ARCH ${ARCH})
36
36
 
37
37
  option(TO_PACKAGE "Build as package" OFF)
38
- option(CLANG_USE_OMP "Use OpenMP in Clang" OFF)
38
+ option(CLANG_USE_GOMP "Use GNU OpenMP in Clang" OFF)
39
39
 
40
40
  if(DEFINED VARIANT)
41
41
  set(VARIANT -${VARIANT})
@@ -98,11 +98,14 @@ if (VULKAN_SDK)
98
98
  endif()
99
99
 
100
100
  # Avoid libomp is not installed commonly
101
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT DEFINED GGML_OPENMP OR GGML_OPENMP AND NOT CLANG_USE_OMP)
101
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT DEFINED GGML_OPENMP OR GGML_OPENMP AND CLANG_USE_GOMP)
102
102
  find_package(OpenMP)
103
103
  if (OpenMP_FOUND)
104
- string(REPLACE "libomp" "libgomp" OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
105
- string(REPLACE "libomp" "libgomp" OpenMP_C_FLAGS "${OpenMP_C_FLAGS}")
104
+ set(OpenMP_C_FLAGS "-fopenmp=libgomp")
105
+ set(OpenMP_CXX_FLAGS "-fopenmp=libgomp")
106
+ set(OpenMP_C_LIB_NAMES "libgomp")
107
+ set(OpenMP_CXX_LIB_NAMES "libgomp")
108
+ set(OpenMP_libgomp_LIBRARY "gomp")
106
109
  endif()
107
110
  endif()
108
111
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fugood/llama.node",
3
3
  "access": "public",
4
- "version": "1.0.0-beta.4",
4
+ "version": "1.0.0-beta.5",
5
5
  "description": "An another Node binding of llama.cpp",
6
6
  "main": "lib/index.js",
7
7
  "scripts": {
@@ -70,19 +70,19 @@
70
70
  "CMakeLists.txt"
71
71
  ],
72
72
  "optionalDependencies": {
73
- "@fugood/node-llama-linux-x64": "1.0.0-beta.4",
74
- "@fugood/node-llama-linux-x64-vulkan": "1.0.0-beta.4",
75
- "@fugood/node-llama-linux-x64-cuda": "1.0.0-beta.4",
76
- "@fugood/node-llama-linux-arm64": "1.0.0-beta.4",
77
- "@fugood/node-llama-linux-arm64-vulkan": "1.0.0-beta.4",
78
- "@fugood/node-llama-linux-arm64-cuda": "1.0.0-beta.4",
79
- "@fugood/node-llama-win32-x64": "1.0.0-beta.4",
80
- "@fugood/node-llama-win32-x64-vulkan": "1.0.0-beta.4",
81
- "@fugood/node-llama-win32-x64-cuda": "1.0.0-beta.4",
82
- "@fugood/node-llama-win32-arm64": "1.0.0-beta.4",
83
- "@fugood/node-llama-win32-arm64-vulkan": "1.0.0-beta.4",
84
- "@fugood/node-llama-darwin-x64": "1.0.0-beta.4",
85
- "@fugood/node-llama-darwin-arm64": "1.0.0-beta.4"
73
+ "@fugood/node-llama-linux-x64": "1.0.0-beta.5",
74
+ "@fugood/node-llama-linux-x64-vulkan": "1.0.0-beta.5",
75
+ "@fugood/node-llama-linux-x64-cuda": "1.0.0-beta.5",
76
+ "@fugood/node-llama-linux-arm64": "1.0.0-beta.5",
77
+ "@fugood/node-llama-linux-arm64-vulkan": "1.0.0-beta.5",
78
+ "@fugood/node-llama-linux-arm64-cuda": "1.0.0-beta.5",
79
+ "@fugood/node-llama-win32-x64": "1.0.0-beta.5",
80
+ "@fugood/node-llama-win32-x64-vulkan": "1.0.0-beta.5",
81
+ "@fugood/node-llama-win32-x64-cuda": "1.0.0-beta.5",
82
+ "@fugood/node-llama-win32-arm64": "1.0.0-beta.5",
83
+ "@fugood/node-llama-win32-arm64-vulkan": "1.0.0-beta.5",
84
+ "@fugood/node-llama-darwin-x64": "1.0.0-beta.5",
85
+ "@fugood/node-llama-darwin-arm64": "1.0.0-beta.5"
86
86
  },
87
87
  "devDependencies": {
88
88
  "@babel/preset-env": "^7.24.4",