diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml index e220aefe0..05d430c2a 100644 --- a/.github/workflows/kcpp-build-release-win-full.yaml +++ b/.github/workflows/kcpp-build-release-win-full.yaml @@ -53,16 +53,17 @@ jobs: mv bin/Release/koboldcpp_cublas.dll ../koboldcpp_cublas.dll cd .. - # - name: Download CuBLAS Libraries - # run: | - # curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/cublas64_11.dll --output cublas64_11.dll - # curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/cublasLt64_11.dll --output cublasLt64_11.dll - # ls - - name: Copy CuBLAS Libraries + # note: The libraries that come from the github cuda directory seem to be larger, so they are not recommended + - name: Download CuBLAS Libraries run: | - copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublasLt64_11.dll" . - copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublas64_11.dll" . + curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/cublas64_11.dll --output cublas64_11.dll + curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/cublasLt64_11.dll --output cublasLt64_11.dll ls + # - name: Copy CuBLAS Libraries + # run: | + # copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublasLt64_11.dll" . + # copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublas64_11.dll" . + # ls - name: Package PyInstallers id: make_pyinstaller diff --git a/koboldcpp.py b/koboldcpp.py index d875987a7..c2b0ca0f4 100644 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -2764,7 +2764,10 @@ def delete_old_pyinstaller(): kobold_itemcheck1 = os.path.join(absdirpath, 'koboldcpp_default.dll') kobold_itemcheck2 = os.path.join(absdirpath, 'koboldcpp_default.so') kobold_itemcheck3 = os.path.join(absdirpath, 'klite.embd') - if os.path.exists(kobold_itemcheck1) or os.path.exists(kobold_itemcheck2) or os.path.exists(kobold_itemcheck3): + kobold_itemcheck4 = os.path.join(absdirpath, 'cublasLt64_11.dll') + kobold_itemcheck5 = os.path.join(absdirpath, 'cublas64_11.dll') + kobold_itemcheck6 = os.path.join(absdirpath, 'clblast.dll') + if os.path.exists(kobold_itemcheck1) or os.path.exists(kobold_itemcheck2) or os.path.exists(kobold_itemcheck3) or (os.path.exists(kobold_itemcheck4) and os.path.exists(kobold_itemcheck5) and os.path.exists(kobold_itemcheck6)): try: shutil.rmtree(absdirpath) print(f"Deleted orphaned pyinstaller dir: {absdirpath}")