AI/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix Python build after CUDA PR (#2373)

Browse Source 
Build with -DCMAKE_BUILD_TYPE=Release, and use MSVC on Windows.

Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2024-05-29 10:52:45 -04:00 committed by GitHub
parent e94177ee9a
commit 8a70f770a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.circleci/continue_config.yml
View File

@ -421,7 +421,7 @@ jobs:
export PATH=$PATH:/usr/local/cuda/bin export PATH=$PATH:/usr/local/cuda/bin
git submodule update --init --recursive git submodule update --init --recursive
cd gpt4all-backend cd gpt4all-backend
cmake -B build cmake -B build -DCMAKE_BUILD_TYPE=Release
cmake --build build --parallel cmake --build build --parallel
- run: - run:
name: Build wheel name: Build wheel
@ -451,7 +451,7 @@ jobs:
command: | command: |
git submodule update --init # don't use --recursive because macOS doesn't use Kompute git submodule update --init # don't use --recursive because macOS doesn't use Kompute
cd gpt4all-backend cd gpt4all-backend
cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
cmake --build build --parallel cmake --build build --parallel
- run: - run:
name: Build wheel name: Build wheel
@ -466,13 +466,17 @@ jobs:
- "*.whl" - "*.whl"
build-py-windows: build-py-windows:
executor: machine:
name: win/default image: 'windows-server-2019-vs2019:2022.08.1'
resource_class: windows.large
shell: powershell.exe -ExecutionPolicy Bypass
steps: steps:
- checkout - checkout
- run: - run:
name: Install MinGW64 name: Update Submodules
command: choco install -y mingw --force --no-progress command: |
git submodule sync
git submodule update --init --recursive
- run: - run:
name: Install VulkanSDK name: Install VulkanSDK
command: | command: |
@ -486,31 +490,40 @@ jobs:
- run: - run:
name: Install dependencies name: Install dependencies
command: command:
choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' choco install -y cmake ninja --installargs 'ADD_CMAKE_TO_PATH=System'
- run: - run:
name: Install Python dependencies name: Install Python dependencies
command: pip install setuptools wheel cmake command: pip install setuptools wheel cmake
- run: - run:
name: Build C library name: Build C library
command: | command: |
git submodule update --init --recursive # Visual Studio setup
cd gpt4all-backend # I would use Enter-VsDevShell but it causes cudafe++ to segfault
$Env:Path += ";C:\ProgramData\mingw64\mingw64\bin" $Env:PATH += ";C:\Program Files (x86)\Windows Kits\10\bin\x64"
$Env:Path += ";C:\VulkanSDK\1.3.261.1\bin" $Env:PATH += ";C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64"
$Env:PATH += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64"
$Env:LIB = "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\ucrt\x64"
$Env:LIB += ";C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\um\x64"
$Env:LIB += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\lib\x64"
$Env:LIB += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\ATLMFC\lib\x64"
$Env:INCLUDE = "C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\ucrt"
$Env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\um"
$Env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\shared"
$Env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt"
$Env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt"
$Env:INCLUDE += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\VS\include"
$Env:INCLUDE += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include"
$Env:INCLUDE += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\ATLMFC\include"
$Env:PATH += ";C:\VulkanSDK\1.3.261.1\bin"
$Env:VULKAN_SDK = "C:\VulkanSDK\1.3.261.1" $Env:VULKAN_SDK = "C:\VulkanSDK\1.3.261.1"
cmake -G "MinGW Makefiles" -B build -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON -DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF cd gpt4all-backend
cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON
cmake --build build --parallel cmake --build build --parallel
- run: - run:
name: Build wheel name: Build wheel
# TODO: As part of this task, we need to move mingw64 binaries into package.
# This is terrible and needs a more robust solution eventually.
command: | command: |
cd gpt4all-bindings/python cd gpt4all-bindings/python
cd gpt4all
mkdir llmodel_DO_NOT_MODIFY
mkdir 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 python setup.py bdist_wheel --plat-name=win_amd64
- store_artifacts: - store_artifacts:
path: gpt4all-bindings/python/dist path: gpt4all-bindings/python/dist