From 017c3a9649fb1b5b4444104ed808e96375fff664 Mon Sep 17 00:00:00 2001 From: cebtenzzre Date: Wed, 18 Oct 2023 20:24:54 -0400 Subject: [PATCH] python: prepare version 2.0.0rc1 (#1529) --- .circleci/continue_config.yml | 14 +++++++++----- gpt4all-backend/llama.cpp.cmake | 2 +- gpt4all-bindings/csharp/README.md | 2 +- gpt4all-bindings/csharp/build_win-mingw.ps1 | 4 ++-- gpt4all-bindings/python/setup.py | 2 +- .../typescript/scripts/build_mingw.ps1 | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 0c0ba3b0..19d960ef 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -414,6 +414,8 @@ jobs: command: | cd gpt4all-bindings/python/ python setup.py bdist_wheel --plat-name=manylinux1_x86_64 + - store_artifacts: + path: gpt4all-bindings/python/dist - persist_to_workspace: root: gpt4all-bindings/python/dist paths: @@ -445,6 +447,8 @@ jobs: command: | cd gpt4all-bindings/python python setup.py bdist_wheel --plat-name=macosx_10_15_universal2 + - store_artifacts: + path: gpt4all-bindings/python/dist - persist_to_workspace: root: gpt4all-bindings/python/dist paths: @@ -458,9 +462,6 @@ jobs: - run: name: Install MinGW64 command: choco install -y mingw --force --no-progress - - run: - name: Add MinGW64 to PATH - command: $env:Path += ";C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin" - run: name: Install VulkanSDK command: | @@ -481,6 +482,7 @@ jobs: cd gpt4all-backend mkdir build cd build + $env:Path += ";C:\ProgramData\mingw64\mingw64\bin" $env:Path += ";C:\VulkanSDK\1.3.261.1\bin" cmake -G "MinGW Makefiles" .. -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON -DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF cmake --build . --parallel @@ -493,9 +495,11 @@ jobs: cd gpt4all mkdir llmodel_DO_NOT_MODIFY mkdir llmodel_DO_NOT_MODIFY/build/ - cp 'C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\*dll' 'llmodel_DO_NOT_MODIFY/build/' + cp 'C:\ProgramData\mingw64\mingw64\bin\*dll' 'llmodel_DO_NOT_MODIFY/build/' cd .. python setup.py bdist_wheel --plat-name=win_amd64 + - store_artifacts: + path: gpt4all-bindings/python/dist - persist_to_workspace: root: gpt4all-bindings/python/dist paths: @@ -612,7 +616,7 @@ jobs: - run: name: Build Libraries command: | - $MinGWBin = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin" + $MinGWBin = "C:\ProgramData\mingw64\mingw64\bin" $Env:Path += ";$MinGwBin" $Env:Path += ";C:\Program Files\CMake\bin" $Env:Path += ";C:\VulkanSDK\1.3.261.1\bin" diff --git a/gpt4all-backend/llama.cpp.cmake b/gpt4all-backend/llama.cpp.cmake index 23959783..72c3fee1 100644 --- a/gpt4all-backend/llama.cpp.cmake +++ b/gpt4all-backend/llama.cpp.cmake @@ -222,7 +222,7 @@ if (LLAMA_KOMPUTE) if (EXISTS "${LLAMA_DIR}/kompute/CMakeLists.txt") message(STATUS "Kompute found") - set(KOMPUTE_OPT_LOG_LEVEL Error CACHE STRING "Kompute log level") + set(KOMPUTE_OPT_LOG_LEVEL Critical CACHE STRING "Kompute log level") add_subdirectory(${LLAMA_DIR}/kompute) # Compile our shaders diff --git a/gpt4all-bindings/csharp/README.md b/gpt4all-bindings/csharp/README.md index 458e09a7..9829a976 100644 --- a/gpt4all-bindings/csharp/README.md +++ b/gpt4all-bindings/csharp/README.md @@ -60,7 +60,7 @@ chmod +x ./build_linux.sh 1. Setup ``` choco install mingw -$env:Path += ";C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin" +$env:Path += ";C:\ProgramData\mingw64\mingw64\bin" choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' ``` 2. Run the `./build_win-mingw.ps1` build script diff --git a/gpt4all-bindings/csharp/build_win-mingw.ps1 b/gpt4all-bindings/csharp/build_win-mingw.ps1 index 33b34315..0e9e5d95 100644 --- a/gpt4all-bindings/csharp/build_win-mingw.ps1 +++ b/gpt4all-bindings/csharp/build_win-mingw.ps1 @@ -12,5 +12,5 @@ cmake -G "MinGW Makefiles" -S ..\..\gpt4all-backend -B $BUILD_DIR cmake --build $BUILD_DIR --parallel --config Release # copy native dlls -cp "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\*dll" $LIBS_DIR -cp "$BUILD_DIR\bin\*.dll" $LIBS_DIR \ No newline at end of file +cp "C:\ProgramData\mingw64\mingw64\bin\*dll" $LIBS_DIR +cp "$BUILD_DIR\bin\*.dll" $LIBS_DIR diff --git a/gpt4all-bindings/python/setup.py b/gpt4all-bindings/python/setup.py index 2ae7b37d..4d5d7e6d 100644 --- a/gpt4all-bindings/python/setup.py +++ b/gpt4all-bindings/python/setup.py @@ -61,7 +61,7 @@ copy_prebuilt_C_lib(SRC_CLIB_DIRECtORY, setup( name=package_name, - version="1.0.12", + version="2.0.0rc1", description="Python bindings for GPT4All", author="Nomic and the Open Source Community", author_email="support@nomic.ai", diff --git a/gpt4all-bindings/typescript/scripts/build_mingw.ps1 b/gpt4all-bindings/typescript/scripts/build_mingw.ps1 index 47d00a4f..a94d44fd 100644 --- a/gpt4all-bindings/typescript/scripts/build_mingw.ps1 +++ b/gpt4all-bindings/typescript/scripts/build_mingw.ps1 @@ -12,5 +12,5 @@ cmake -G "MinGW Makefiles" -S ..\..\gpt4all-backend -B $BUILD_DIR -DLLAMA_AVX2=O cmake --build $BUILD_DIR --parallel --config Release # copy native dlls -# cp "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\*dll" $LIBS_DIR +# cp "C:\ProgramData\mingw64\mingw64\bin\*dll" $LIBS_DIR cp "$BUILD_DIR\bin\*.dll" $LIBS_DIR