Skip to content

Commit

Permalink
Merge branch 'nomic-ai:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
abdulrahman305 authored Feb 15, 2024
2 parents 3fc5977 + f2024a1 commit b81d008
Show file tree
Hide file tree
Showing 44 changed files with 424 additions and 409 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ workflows:
config-path: .circleci/continue_config.yml
mapping: |
.circleci/.* run-all-workflows true
gpt4all-backend/.* run-all-workflows true
gpt4all-bindings/python/.* run-python-workflow true
gpt4all-bindings/typescript/.* run-ts-workflow true
gpt4all-bindings/csharp/.* run-csharp-workflow true
gpt4all-backend/.* run-chat-workflow true
gpt4all-chat/.* run-chat-workflow true
.* run-default-workflow true
68 changes: 29 additions & 39 deletions .circleci/continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,8 @@ jobs:
name: Build
command: |
export CMAKE_PREFIX_PATH=~/Qt/6.5.1/gcc_64/lib/cmake
mkdir build
cd build
~/Qt/Tools/CMake/bin/cmake -DCMAKE_BUILD_TYPE=Release -S ../gpt4all-chat -B .
~/Qt/Tools/CMake/bin/cmake --build . --target all
~/Qt/Tools/CMake/bin/cmake -DCMAKE_BUILD_TYPE=Release -S gpt4all-chat -B build
~/Qt/Tools/CMake/bin/cmake --build build --target all
build-gpt4all-chat-windows:
machine:
Expand Down Expand Up @@ -291,17 +289,15 @@ jobs:
$Env:INCLUDE = "${Env:INCLUDE};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include"
$Env:INCLUDE = "${Env:INCLUDE};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\ATLMFC\include"
$Env:VULKAN_SDK = "C:\VulkanSDK\1.3.261.1"
mkdir build
cd build
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
"-DCMAKE_GENERATOR:STRING=Ninja" `
"-DCMAKE_BUILD_TYPE=Release" `
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.5.1\msvc2019_64" `
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
"-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" `
"-S ..\gpt4all-chat" `
"-B ."
& "C:\Qt\Tools\Ninja\ninja.exe"
"-S gpt4all-chat" `
"-B build"
& "C:\Qt\Tools\Ninja\ninja.exe" -C build
build-gpt4all-chat-macos:
macos:
Expand Down Expand Up @@ -332,17 +328,15 @@ jobs:
- run:
name: Build
command: |
mkdir build
cd build
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
-DCMAKE_GENERATOR:STRING=Ninja \
-DBUILD_UNIVERSAL=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake/Qt6 \
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
-S ../gpt4all-chat \
-B .
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build . --target all
-S gpt4all-chat \
-B build
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build build --target all
build-ts-docs:
docker:
- image: cimg/base:stable
Expand Down Expand Up @@ -407,13 +401,10 @@ jobs:
- run:
name: Build C library
command: |
git submodule init
git submodule update
git submodule update --init --recursive
cd gpt4all-backend
mkdir build
cd build
cmake ..
cmake --build . --parallel
cmake -B build
cmake --build build --parallel
- run:
name: Build wheel
command: |
Expand All @@ -440,13 +431,10 @@ jobs:
- run:
name: Build C library
command: |
git submodule init
git submodule update
git submodule update --init # don't use --recursive because macOS doesn't use Kompute
cd gpt4all-backend
mkdir build
cd build
cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
cmake --build . --parallel
cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
cmake --build build --parallel
- run:
name: Build wheel
command: |
Expand Down Expand Up @@ -482,16 +470,13 @@ jobs:
- run:
name: Build C library
command: |
git submodule init
git submodule update
git submodule update --init --recursive
cd gpt4all-backend
mkdir build
cd build
$Env:Path += ";C:\ProgramData\mingw64\mingw64\bin"
$Env:Path += ";C:\VulkanSDK\1.3.261.1\bin"
$Env:VULKAN_SDK = "C:\VulkanSDK\1.3.261.1"
cmake -G "MinGW Makefiles" .. -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON -DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF
cmake --build . --parallel
cmake -G "MinGW Makefiles" -B build -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON -DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF
cmake --build build --parallel
- run:
name: Build wheel
# TODO: As part of this task, we need to move mingw64 binaries into package.
Expand Down Expand Up @@ -679,7 +664,7 @@ jobs:

build-csharp-linux:
docker:
- image: mcr.microsoft.com/dotnet/sdk:7.0-jammy # Ubuntu 22.04
- image: mcr.microsoft.com/dotnet/sdk:8.0
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -735,6 +720,10 @@ jobs:
- gpt4all-csharp-nuget-packages-win
- attach_workspace:
at: C:\Users\circleci\workspace
- run:
name: "Install .NET"
command: |
choco install -y dotnet-8.0-sdk
- run:
name: "Prepare Native Libs"
command: |
Expand Down Expand Up @@ -782,7 +771,8 @@ jobs:
- run:
name: Install dependencies
command: |
brew install --cask dotnet-sdk
brew tap isen-ng/dotnet-sdk-versions
brew install --cask dotnet-sdk8-0-100
- attach_workspace:
at: /tmp/workspace
- run:
Expand Down Expand Up @@ -824,7 +814,7 @@ jobs:

store-and-upload-nupkgs:
docker:
- image: mcr.microsoft.com/dotnet/sdk:6.0-jammy # Ubuntu 22.04
- image: mcr.microsoft.com/dotnet/sdk:8.0
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -840,9 +830,9 @@ jobs:
cp /tmp/workspace/runtimes/linux-x64/*.so runtimes/linux-x64/native/
mkdir -p runtimes/win-x64/native
cp /tmp/workspace/runtimes/win-x64/*.dll runtimes/win-x64/native/
mkdir -p runtimes/osx/native
cp /tmp/workspace/runtimes/osx-x64/*.dylib runtimes/osx/native/
cp /tmp/workspace/runtimes/osx-x64/*.metal runtimes/osx/native/
#mkdir -p runtimes/osx/native
#cp /tmp/workspace/runtimes/osx-x64/*.dylib runtimes/osx/native/
#cp /tmp/workspace/runtimes/osx-x64/*.metal runtimes/osx/native/
dotnet pack ./Gpt4All/Gpt4All.csproj -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -c Release
dotnet nuget push ./Gpt4All/bin/Release/Gpt4All.*.nupkg -s $NUGET_URL -k $NUGET_TOKEN --skip-duplicate
- store_artifacts:
Expand Down Expand Up @@ -1209,4 +1199,4 @@ workflows:
- nuget-hold
- build-csharp-windows
- build-csharp-linux
- build-csharp-macos
#- build-csharp-macos
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bindings-bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: "\U0001F6E0 Bindings Bug Report"
about: A bug report for the GPT4All Bindings
labels: ["bindings", "bug-unconfirmed"]
---

<!-- Before creating a new issue, please make sure to take a few moments to check the issue tracker for existing issues about the bug. -->

### Bug Report

<!-- A clear and concise description of what the bug is. -->

### Example Code

<!-- Please provide a minimal code example that can be used to experience this issue. Delete this section if it does not apply. -->

### Steps to Reproduce

<!-- List the steps that should be taken to experience this issue. -->

1.
2.
3.

### Expected Behavior

<!-- In a few words, what did you expect to happen? -->

### Your Environment

- Bindings version (e.g. "Version" from `pip show gpt4all`):
- Operating System:
- Chat model used (if applicable):

<!-- You can freely edit this text, please remove all the lines you believe are unnecessary. -->
55 changes: 0 additions & 55 deletions .github/ISSUE_TEMPLATE/bug-report.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/chat-bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: "\U0001F4AC GPT4All Bug Report"
about: A bug report for GPT4All Chat
labels: ["chat", "bug-unconfirmed"]
---

<!-- Before creating a new issue, please make sure to take a few moments to check the issue tracker for existing issues about the bug. -->

### Bug Report

<!-- A clear and concise description of what the bug is. -->

### Steps to Reproduce

<!-- List the steps that should be taken to experience this issue. Provide any relevant information about your configuration, and describe anything that was unexpected. -->

1.
2.
3.

### Expected Behavior

<!-- In a few words, what did you expect to happen? -->

### Your Environment

- GPT4All version:
- Operating System:
- Chat model used (if applicable):

<!-- You can freely edit this text, please remove all the lines you believe are unnecessary. -->
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: "\U0001F4C4 Documentation"
about: An issue related to the GPT4All documentation
labels: ["documentation"]
---

### Documentation

<!-- Please describe the issue with the documentation as clearly as possible. -->
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/documentation.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: "\U0001F680 Feature Request"
about: Submit a proposal/request for a new GPT4All feature
title: "[Feature] Feature request title..."
labels: ["enhancement"]
---

### Feature Request

<!-- A clear and concise description of the feature proposal. -->
30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE/feature-request.yml

This file was deleted.

Loading

0 comments on commit b81d008

Please sign in to comment.