Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 4aa091e52dcecb018f1336a655832b9cf637e62a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jun 5 12:16:57 2024 -0500

    Delete .github/workflows/Pathtester.yml

commit c36d4cd85625368e7838350f51d2f65b069faa46
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jun 5 12:14:12 2024 -0500

    Update Pathtester.yml

commit ac44718cf7be322b11930e7a60d9b7d36ff53ba6
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jun 5 12:11:25 2024 -0500

    Update Pathtester.yml

commit 06ba55eefa05d7586a74316e6bbd8b2c803d1e0e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jun 5 11:47:20 2024 -0500

    Update Pathtester.yml

commit 85220b560f611fd2579be74dbf7a5cc68cdb65ff
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jun 5 11:46:45 2024 -0500

    Create Pathtester.yml

commit b5f2ee7c9536d97e804fa94b90153d92400f2e93
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 22:53:15 2024 -0500

    Update CMakeLists.txt amd clang

commit 70684c78e1eb8f0f9b4458b11c2ab0bbbd07afc8
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 21:24:01 2024 -0500

    Update CMakeLists.txt

commit 7ab57963342e1ddfdba61cb682888aa13e7fe8bc
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 16:07:24 2024 -0500

    Update CMakeLists.txt switch to all llvm clang

commit e67e66e38367042381437123ef3cc516bf26ed79
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 15:41:47 2024 -0500

    Update CMakeLists.txt

commit fbfe65a81d9881bf44323cc5316167112008c167
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 12:58:37 2024 -0500

    Update makefile and cmake-rocm-windows.yml

commit b232f2ddf0f05280ce21ec2ab03e2844e14c4265
Merge: feecb41d 57894178
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jun 4 12:58:02 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit feecb41dfa9a4f46e467fa9e3106040cacd6868e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:49:07 2024 -0500

    Update make_pyinstaller_exe_rocm_only.bat

commit 5fe26236fe347b3399fc70844a32b6bfafd09b17
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:48:43 2024 -0500

    Update make_pyinst_rocm_hybrid_henk_yellow.bat

commit 3bd2af2093330438c36a34964cc3b0dbdd82e68f
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:48:07 2024 -0500

    Update README.md

commit 36883c8e043837cfb8ecef84439ee0526ebb7c8d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:35:19 2024 -0500

    Update README.md

commit 698bec72b070d4db74f31821792aeafe222656ff
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:32:06 2024 -0500

    Update README.md compilation guide

commit d2f5e1f19f321a8ed6116e32660f773e354a3d75
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 14:12:49 2024 -0500

    use tar not 7z in make_pyinstaller_exe_rocm_only.bat

commit 7636580b887de991254cf52432a327ad3baae5aa
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun May 26 13:49:04 2024 -0500

    Update make_pyinstaller_exe_rocm_only.bat

commit 98477a16e5085b6fd57905b8d75e7b89a9684a1b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat May 25 16:49:33 2024 -0500

    windows is fixed??

commit 798f516b565c50aa910d8c6bf1161610907d212f
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri May 24 21:10:48 2024 -0500

    temp fix for windows

commit fc1958970832f9b6c1f8bdcbfb300828d1a16d10
Merge: 40aa1823 65305013
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri May 24 21:04:55 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 40aa18232968d285c231b4ea3a03f211d78b325e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 13:22:35 2024 -0500

    invalid escape

commit 60af2da0a656a991c3d83c4af095b4aa2b889175
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 13:02:07 2024 -0500

    more cmake changes

commit d23982b520ddda321ac6f0512916f68e942cd407
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 12:42:35 2024 -0500

    Update cmake-rocm-windows.yml

commit 1a39f0c95f1b761642b89f0bf2c63c5be40ca7f2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 12:39:45 2024 -0500

    cmake try rocm build with clang/clang++ only

commit 206461c8f92705d0c39f911d5c78d68b64ee2bff
Merge: c729a982 702be65e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 12:08:30 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit c729a982d43e47c5905ab60db68db2e8d91027f9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 16 12:04:28 2024 -0500

    cmake changes to try and fix windows

commit cd0e18afe0c83bdfaf0fdc0ab2fb7ed9952d38b2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 9 10:04:01 2024 -0500

    Update CMakeLists.txt xhip

commit e2b42c89c5d64499f2236575560ba15d0a954943
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 9 09:52:04 2024 -0500

    Update cmake-rocm-windows.yml

commit ad2780320a5d83e6a563f5826c764063a36205c0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu May 9 09:51:12 2024 -0500

    set mcode object version to 4

commit cfa4cddbbd9a3f4f5e8da5df299b1436e78481d4
Merge: 9adf5c07 a3718c63
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon May 6 01:37:17 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 9adf5c074b7ea885361aeaffddd222fe46168aed
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed May 1 19:58:01 2024 -0500

    Update cmake-rocm-windows.yml

commit 97844b0003cb75b09e0af55c25de6342c449b70b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed May 1 18:28:34 2024 -0500

    Update CMakeLists.txt

commit d8742eb18c0a370d460a34c3aa061deb21b56359
Merge: 4a3626ee 3c2bd8aa
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed May 1 10:04:34 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 4a3626eebf36565e93b3d5f79ebbcfdcbb815d97
Merge: 0766d6f1 81619f36
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed May 1 09:28:24 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 0766d6f1069f48de722c1e4bbf915bd027897fde
Merge: 90b1ff19 b641d986
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed May 1 09:04:42 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 90b1ff199655ba0eed8257007a1e80fbdad52402
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 23 20:57:24 2024 -0500

    Update deprecated upload-artifact to v4 cmake-rocm-windows.yml

commit c039f577f583787eebb11006a9b954f1b8aa1492
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 23 20:45:45 2024 -0500

    Update dependency in cmake-rocm-windows.yml

commit f123ad3f234ffbe77c75495add2e84936b07bbe7
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 23 19:06:01 2024 -0500

    Update cmake-rocm-windows.yml

commit eb896c1d9ccb96c33c851cd6789d15993884d03a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 23 18:59:35 2024 -0500

    Update cmake-rocm-windows.yml

commit 23f663f7b63691c5c591f7b315e3706ddba611ef
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 23 18:52:55 2024 -0500

    Update cmakelist.txt

    Update CMakeLists.txt

commit 9d5a947f46dcdb6c87181c0fe72dee5a1ff10233
Merge: a622e1a1 593f08bb
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Apr 22 01:44:15 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit a622e1a1771ad1b6936d27ff2b7cfc19f404e89f
Merge: d8895744 41fa4310
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Apr 11 10:05:11 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit d8895744e9ef6cabb73dd170622df61e1c45f0ad
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Apr 11 09:44:47 2024 -0500

    Delete .github/workflows/make-vulkan-windows.yml

commit 32911a21f3616664906c807e8b60b8744252d1e1
Merge: 24e9a4f4 bf320dca
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Apr 10 10:26:22 2024 -0500

    update to 1.62.2

commit 24e9a4f4f049d0851953f075965595e6660a7840
Merge: 9c1707d6 df596aee
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Apr 9 23:22:59 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 9c1707d6d1d6115750d203d0854eaf2dc01cbf32
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Mar 20 11:51:43 2024 -0500

    set pyinstaller version to 6.4.0

commit 801b5b5c05f682c9940a9dd16500bc24c7be207c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Mar 17 11:29:24 2024 -0500

    revert makefile change

    revert makefile  because of a breaking change

commit 98f9388463be67361e2f1e59a343673fe9874cce
Merge: ba3f5e37 f3b76511
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Mar 15 07:07:49 2024 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit ba3f5e37a55a60b0e696c45f22f82ac2ef37af34
Merge: 893a1c8b f44df0e2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Mar 6 14:48:33 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 893a1c8b3d58566bd4ad7c290aec9ff6a9aed361
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Mar 5 07:58:04 2024 -0600

    Update easy_KCPP-ROCm_install.sh exec iss.

commit a6e7e7b6215b68b5812891843cfc0918b0be2bd4
Merge: 5acb4e24 39ae58ef
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Feb 26 01:42:17 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 5acb4e246fd882d036dc975055f1bca000f4a6fc
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 14:52:06 2024 -0600

    update build file to add vulkan

commit df1f77bd3f94c9034ecba719b336ebc5d045cb04
Merge: be7a9ff3 7eaf572b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 14:50:35 2024 -0600

    Merge branch 'main' of https://github.com/YellowRoseCx/koboldcpp-rocm

commit 7eaf572bb9802bd1c5c60fd937ad3dd3b282d940
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 13:21:17 2024 -0600

    Update make-vulkan-windows.yml

commit e2d122f840a463c369e6784bc520e5c2600502be
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 13:17:57 2024 -0600

    Create make-vulkan-windows.yml

commit be7a9ff33bb441342044e929b3ab04aad34e821c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 13:04:23 2024 -0600

    add additional tooltips

commit ce74a1f841a7fdd2cb8385eb8cfa7d162a263af2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 13:03:54 2024 -0600

    move update checkbox

commit 27355421ebf6fa20b0fe1e1996c82f03327b2551
Merge: b9860f7e 60212827
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Feb 25 12:33:59 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit b9860f7e1b3589459a4f15f3d3a4759631dcb3e1
Merge: ae6ece1d 1e460bb9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Feb 17 22:51:56 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit ae6ece1da9b35162fd2d4af1c74bacb8f90822a4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Feb 10 20:38:57 2024 -0600

    correct the build procedure

commit 3051a154ba702740de5adc862dc0fd65e243ad83
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Feb 10 13:26:21 2024 -0600

    Implement Building for GFX1031/GFX1032 on Windows

    Experimental support for GFX1031 and GFX1032 architectures on ROCm for Windows

commit 744d57022201bef31d161cfc21d608634a2aa77d
Merge: d0d4c80f d1aff0e9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Feb 10 13:24:12 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit d0d4c80fe9b107f04dc6ab4454f6508f053c060d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jan 30 23:24:12 2024 -0600

    gfx1031 file extraction was in wrong place

commit 1eae8ca031f4761f762e7a7ab949735a6b63ec92
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jan 30 18:10:24 2024 -0600

    Update cmake-rocm-windows.yml for 6700XT

commit e0a3aa34b6dbf0ac6f28b1b10c693780bc1241b0
Merge: 02053756 dc7ca93f
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jan 27 22:47:12 2024 -0600

    Merge pull request #30 from one-lithe-rune/windows_cmake_hipsdk_5_7_1

    Update Github build actions/cmake command lines for windows HIP SDK 5.7.1

commit 020537567b1faa0efbee1f387bad69537df04b01
Merge: 449f48e9 61ca3a0d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jan 27 18:04:02 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 449f48e98a8dcecc30d46dfa2fb585e297ccdfc8
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jan 23 03:15:41 2024 -0600

    print error on exception, only set gfx override if 1 gpu

commit dc7ca93f11be126fa9acd3611bb1aa690e3d7d03
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Fri Jan 19 09:36:12 2024 +0000

    Update tests-rocm-windows & readme for HIP SDK 5.7.1

    * Update README with cmake commandline on windows for HIP SDK 5.7.1
    * Update Gibhub action tests-rocm-windows.yml for HIP SDK 5.7.1

commit 13868bf674edfe6ecbc9147bddd887fc65f67b8c
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Fri Jan 19 09:27:58 2024 +0000

    Update cmake-rocm-windows to set HIP_PLATFORM

    * Explicitly set HIP_PLATFORM=amd in the cmake defines, to avoid the code
    path in the Hip SDK 5.7.1 where it tries to use the broken hipconfig.bat supplied
    with the SDK.

commit 0481293488bf31bad89ebd02e868bd7315bce634
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Thu Jan 18 23:43:30 2024 +0000

    Update cmake-rocm-windows workflow for HIP sdk 5.7.1

    * Bump the rocm/hip version for the windows build to 5.7.1

commit 61765f6b006d9fedcffac12f5e543ffd417f761a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jan 10 18:12:19 2024 -0600

    Update README.md to make it better organized

commit cdb2b733ebe7a66633d0217a944d1ff59724ecb2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jan 10 17:14:04 2024 -0600

    better way to find rocminfo

commit f976b841b7ee8d6276e5bc99da1fe5a3ee9220fe
Merge: 433a3ce6 d2bf4798
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jan 10 14:47:12 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 433a3ce645cbdfab69ab7f1c67421d3c786a15fb
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jan 9 22:24:35 2024 -0600

    Auto set HSA_OVERRIDE_GFX=10.3.0 for RX6000 series

    Automatically set HSA_OVERRIDE_GFX_VERSION=10.3.0 for all AMD RX 6000 series GPUs

commit 236ac0144ae1c2fad8df5eb1223fbbff751d8aec
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 21:35:53 2024 -0600

    glob is broken with backslashes

commit f984d4ad4fad448a5c03eaf0e921206aae6f3b46
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 20:49:56 2024 -0600

    Update cmake-rocm-windows.yml

commit c96cc5ce5eb1f0be73da3875b75fdabe0b5224ee
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 20:09:46 2024 -0600

    Update glob pattern cmake-rocm-windows.yml

commit 2e41f6690cce77498d67c363f522b5dbb563968b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 18:58:58 2024 -0600

    Create zip of kcpp_rocm files for release

commit 4f7345234e361b203fabd195cb42e08965474783
Merge: e2221526 9e0dee76
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 17:07:32 2024 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit e2221526fb20c7893a525c29b00050b4d4c350c6
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jan 1 14:08:20 2024 -0600

    Create zip of kcpp_rocm files for release

commit b85d59eb23338a49de0e2e3a1fee0338aa7f41bf
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 23 03:14:56 2023 -0600

    set TLS min/max versions with SSL

commit 76eb691f5a866da460d972dc7e5cf151d5c8ebbe
Merge: 031c60b0 71a5afaa
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 23 02:21:52 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 031c60b0cb73d5d6fd7bc1190ef6b4ba854fa3af
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Dec 19 01:40:24 2023 -0600

    checkforupdates check YR patch level

commit 47dbaa87e28fd9c71eff50f619dcbc5525665f8f
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Dec 19 00:12:34 2023 -0600

    hipBLAS auto-selection logic fix

    .kcpps hipblas option tweak
    only check for CUDevicesNames[0]!="" if CuBLAS
    since sometimes/most of the time AMD GPU info is fetched with OpenCL, requiring ``CUDevicesNames[0]!=""`` prevents hipBLAS from being selected. Only check ``CUDevicesNames[0]!=""`` if Use CuBLAS in runopts
    keep elif statement

commit f6c74d245d8c8d8fe186a954d2b4acc44a428302
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Dec 18 23:16:47 2023 -0600

    windows specific text color handling

commit fc47a2712c2fddfcd61a46d403df9885ed02bb7b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Dec 18 22:36:48 2023 -0600

    Add --checkforupdates argument, fix saves

    If enabled, the argument --checkforupdates will fetch the Kobold-ROCm release page one time on start up via HTTPS and compare the latest version number with the current version number and notify the user if a new version is available.
    A GUI button is shown on the Network tab.
    Fixed a bug where importing a save file wouldn't choose the hipBLAS option

commit 509ad00985c82327ad1ab630a24319dceb8a4f2b
Merge: eee005e4 ec052307
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Dec 17 19:13:15 2023 -0600

    Update to 1.52.2 with 'upstream/concedo'

commit eee005e451de3c2e547ff318fe8303b3037d0e80
Merge: a2dcd330 77985879
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Dec 14 22:24:42 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit a2dcd3306750982cb8be3b87b01642e42f80cd03
Merge: f13295b5 30675479
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Dec 13 14:58:04 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit f13295b5454b38aa39b70d7b11c15bf2fb1fb842
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Dec 10 22:43:02 2023 -0600

    CLBLAST_noavx2 should only be built on Windows

commit a2b441ae95e1fc4462883c1967e6b91726df62b1
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Dec 10 04:59:58 2023 -0600

    Fix GUI backend count label

commit 947e75c24ea9b43817f73478463878e5827f6bab
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Dec 10 01:50:31 2023 -0600

    change default GPUs and add ALL_AMD_GPU flag

    Removed workstation GPUs being built by default. Added a flag to build all AMD ROCm GPUs, use it like "make LLAMA_HIPBLAS=1 ALL_AMD_GPU=1"

commit 56c1218d935e1f488ec9d6ef9caa061bc5995264
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Dec 10 01:49:56 2023 -0600

    Linux kcpp-ROCm pyinstaller script

    Linux pyinstaller script to compile a single file executable of KoboldCpp-ROCm. File Size ends up to be about 1.1GB because it adds in all ROCm GPU kernels and library files. (could possibly be improved)

commit c39c3577d3593350d616186cf567bc3b6da55acd
Merge: 260296f1 0ca814e5
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Dec 5 16:09:52 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 260296f1fe553860752a1545d96b2720361af9a3
Merge: 89963499 c142c563
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 15:14:33 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 8996349943b80b8de5237613d13fb2a6f0ffe3b6
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 15:10:31 2023 -0600

    change upload file name in cmake-rocm-windows.yml!

commit d0c58d6d0cc31f079c70c80b37ad96752102c114
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 03:41:59 2023 -0600

    Update version number in cmake-rocm-windows.yml

commit fbb283a86960ff3437aef0214251bd7fd5dc3027
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 03:39:25 2023 -0600

    update build action to include clblast, openblas, and default

commit 787531d7602f9a61b84be08266b619dc7ef96605
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 03:37:10 2023 -0600

    force hipblas as first option

commit 5be1aa6e14eb9a6d8acdffc963019167379fecbe
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Dec 2 02:51:54 2023 -0600

    amd gpu info fetch cleanup and fix

commit 461bd6219367459ee14b90873e9dc72a961cf33a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Dec 1 21:24:12 2023 -0600

    setup test workflow to build CLBLAST and OpenBLAS

commit f6584d56c831769f93ebce6836ac230b41a39e6c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Dec 1 21:20:53 2023 -0600

    unexpose gcc variables again

commit e8cfbca4e505534bf60cd32a6eb8ae91f432718e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Dec 1 19:55:57 2023 -0600

    expose gcc compiler

commit 0ea110c88be50029fd3f8b29de13e699a1fbd9fd
Merge: b5172fce 495bb3ab
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Dec 1 19:48:48 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit b5172fce6b12735ca83f1a21b3d4aeb189d897ae
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Nov 28 08:54:21 2023 -0600

    Update tests-rocm-windows.yml

commit 9944f6dfd7f0ba74eaa27fdab920d8ff0ee1cdb7
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 15:49:23 2023 -0600

    Update tests-rocm-windows.yml

commit 2aae081c803c81e8b47842e68b45cb561d7c10d3
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 14:00:32 2023 -0600

    Update tests-rocm-windows.yml

commit 6cd180d0de361747464f6ceb84c29b00f4902203
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 13:40:08 2023 -0600

    Update tests-rocm-windows.yml w/ cleaner code

commit 3a4f4b1722c0e647e441e0fefcfdf2e40e421098
Merge: b8ad62ff 56a5fa7a
Author: FamousM1 <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 03:53:06 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit b8ad62ffd5d175bab559f451649e20e58f5052ad
Merge: 0e02ba47 dbd15239
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 03:49:29 2023 -0600

    Merge pull request #28 from one-lithe-rune/amd_device_info_from_vulkan

    Use `vulkaninfo` for AMD gpu heuristics on Windows

commit 0e02ba473d43b6b3c3cc1446dec9cfaedd4c3426
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 26 03:42:54 2023 -0600

    Update make_pyinstaller_exe_rocm_only.bat

commit ec7157f2edb041fda474d048263d5ec2dda2b65b
Merge: 5f5451ea bb531e63
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Nov 25 07:47:44 2023 -0600

    Merge pull request #29 from one-lithe-rune/add_packaging_requirement

    Fix `Warning, GUI failed to start: Reason: No module named 'packaging'` after making new venv

commit 5f5451ea5b84313c06f94be99f50453fe72d231a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 19 14:40:29 2023 -0600

    A few autoheuristics fixes

commit bb531e635a62683097eff55619c8f5144a6d0fe0
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Sun Nov 19 14:30:48 2023 +0000

    Fix 'Warning GUI failed to start' making new venv

    * Adds `packaging` to requirements.txt to clear the above error
    after creating a new venv and `pip install -r requirements.txt`

commit dbd15239582fadac68d6ba9cd9f090b1140373f3
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Sun Nov 19 13:45:37 2023 +0000

    Use `vulkaninfo` for AMD gpu heuristics on Windows

    * Change exception paths for gpu heuristics function to return a
    two part tuple like the non-exception paths, rather than a three
    part one with `False`on the end. This prevents the caller from
    blowing up with an extra exception.
    * Added a path to get the AMD devices via vulkaninfo if we are on
    windows as we will not have have rocminfo there even if the rocm
    SDK is installed (windows rocm SDK :shrug:), and we don't
    require the windows SDK anyway, so we can't use hipinfo either.
    * The new code path, uses the existing AMD device/memory list to get
    the memory info, and only returns devices that are on that list.

commit 8080c01780608f4779297bacb75dd56e6da3e8c5
Merge: 11aa5960 22c56f92
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Nov 18 03:06:54 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 11aa5960ae22e75f5af3604546e22d0cea57df19
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 12 20:02:41 2023 -0600

    remove nvidia print exception

commit fe137cbcab0f47dbc8f4abe01023c99b89890219
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 12 19:51:35 2023 -0600

    sep AMDGPU info func,+autoset_layer support in Win

    Moved the code that gets AMD GPU name and VRAM information to it's own function and added a hardcoded VRAM list for Windows supported AMD GPUs in case to add auto-layering support for Windows

commit 04afeb5e2ceba2dee3fed57261ad44fd8257bb7f
Merge: 1c690a2d a00a32e0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 12 18:49:58 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 1c690a2d86c250e5ee4d6415d6d6f2afa05abc07
Merge: a913ad98 21029421
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Nov 9 21:43:10 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit a913ad98c668c97c6a873c8870bf71f75613d9ca
Merge: 46fa8454 93c4b2a9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Nov 6 00:49:56 2023 -0600

    Merge remote-tracking branch 'upstream/concedo'

commit 46fa8454ee0be99378341d83367188cd9a288e0d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Nov 6 00:20:53 2023 -0600

    big Update CMakeLists.txt

commit 27cb2ebb728d8ae12a8cdf83becd952cb93ac1e2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 5 14:19:30 2023 -0600

    Update tests-rocm-windows.yml

commit 10dc997ad3aea3afe487afca6f0c37618511bcce
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 5 02:58:33 2023 -0600

    update version

commit de6fc03f3005d769f398de6e37f544a80a4a4383
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Nov 5 01:11:57 2023 -0600

    adapt GUI changes and fetch AMD memory

commit e3cfe6bee0a106050c13fa15abfcf380eaa036c7
Merge: 06afb74b faae84ee
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Nov 4 22:01:18 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 06afb74b723f6b492134f85481d8c583e42e05d4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Nov 4 21:47:42 2023 -0500

    makefile updates

    separate hipBLAS compiler, update MMV_Y value, move the section that prints CXX and CC compiler name

commit acec91dd529ade581b92b069e05f224c6bb87a5e
Merge: 82675366 5f1f8a5a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Oct 22 18:31:27 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 826753665082b3adcb0b5e3f155932c285fd7b10
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Oct 21 02:17:34 2023 -0500

    Update cmake-rocm-windows.yml

    rreemove non working 6700xt code

commit 39365067ccda10434120de6fb4090397f01804e2
Merge: 12055438 dd1d61ea
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Oct 21 01:47:07 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 12055438c37ea6dc471b015148d66ccfef977516
Merge: b01a449c 6e34d31c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 17 17:14:37 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit b01a449c21018e58c549cf81f7cadef7381d1d5d
Author: one-lithe-rune <skapusniak@lithe-runes.com>
Date:   Sat Oct 7 12:48:26 2023 +0100

    Merge pull request #27 from one-lithe-rune/allow-sdk-dll-loading - Allow use of hip SDK (if installed) dlls on windows

    * If the rocm/hip sdk is installed on windows, then include the sdk
    as a potential location to load the hipBlas/rocBlas .dlls from. This
    allows running koboldcpp.py directly with python after building
    work on windows without having to build the .exe and run that or
    copy .dlls around.

commit 5934e9f29ca59f368d952d99fd101ec65e2fa69e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Oct 9 00:30:03 2023 -0500

    remove test code for PR Merge

commit 7eb8294969b952bdb694589f294d80479bc245f0
Merge: 04f5b6cf 80e53af2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Oct 8 16:59:07 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 04f5b6cf26f851b30bc0c048265976da3ce7bc41
Merge: 778253e9 9d0dd7ab
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Oct 6 20:47:03 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 778253e9876b31b76526ffec616f6c1b3e5497d4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Oct 4 20:08:32 2023 -0500

    Update README.md exe link

commit 482e507a1f342f0a09b9c67467185bd5368fc841
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Oct 4 20:06:03 2023 -0500

    Update README.md for ROCm exe and build info

commit 0c8518aa36beda12c6225a63c0dfe2d9a5fc1e6d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 3 22:12:49 2023 -0500

    fix for folder misspelling

commit 9206be98454f4d882d07fc6dadcb80c28a904807
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 3 21:10:14 2023 -0500

    Update tests-rocm-windows.yml

commit e0f292b5a166365228184c44d806d514be8d8807
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 3 20:55:50 2023 -0500

    Rename tests-rocm-windows to tests-rocm-windows.yml

commit acfa1b16e54d46ddf8f14c66673fe290fd1ebd45
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 3 20:54:51 2023 -0500

    Create tests-rocm-windows

commit 1e10c24c58ffdfa583faa36a9dd5dbd8f208cef2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Oct 3 00:41:16 2023 -0500

    Update cmake-rocm-windows.yml

commit 424525b5a5a2ffb3c62663104e2757da7d042ef6
Merge: 1c4e4a6e 23b9d3af
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Oct 2 20:07:00 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 1c4e4a6e3d0b5f7f41d4a33fd0669b847dd2c137
Merge: 354fa72c bc841ec3
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Oct 1 02:48:50 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 354fa72c549ad4ce34baa3bde527a31877453e2d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Sep 29 10:57:37 2023 -0500

    Psutil workflow add

commit 16271e027d65539261a352083a05e7cfe77d523c
Merge: 6823315f bfc696fc
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Sep 26 21:21:48 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 6823315f5ee53e55dc3062ee1671e03ca6e1f745
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 04:46:12 2023 -0500

    Update cmake-rocm-windows.yml

commit ff5abe60ff291e8363aa4165bc338d274e240e58
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 04:30:45 2023 -0500

    Delete .github/workflows/c-cpp.yml

commit 11fc774d4a96bbed3be0f7573e800a8b2dc623fb
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 04:28:44 2023 -0500

    Update cmake-rocm-windows.yml

commit 9fdbb35eb289e39cf63ff93e9c2957e57046e3a0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 03:40:05 2023 -0500

    Update code-coverage.yml

commit c9386757402a4192025e326186ff1811fb17e146
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 03:37:57 2023 -0500

    Update cmake-rocm-windows.yml

commit e63896058b85372e5301d032895f9cd748137ca1
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 02:47:18 2023 -0500

    Update CMakeLists.txt

commit b067ef7c8ccba2f3d16c3ed01b9973d475d5c8b1
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 02:32:15 2023 -0500

    Update cmake-rocm-windows.yml

commit 7df43a1e9af6a807dd7bd0ebf4bc95cc90749784
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Sep 25 02:02:45 2023 -0500

    Update cmake-rocm-windows.yml

commit da825d8b41031879f6271c8a2b194e10320d78ed
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 22:57:27 2023 -0500

    Update cmake-rocm-windows.yml

commit 887814d9c0af3271e79da31a934a712b26106757
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 21:12:12 2023 -0500

    Update cmake-rocm-windows.yml

commit 491b8626720e14c91ebee871f955e6aba1751d5c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 20:37:03 2023 -0500

    Update cmake-rocm-windows.yml

commit 38fce3030afabd009f64ced3c33a46b80d482fcc
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 20:21:09 2023 -0500

    Update cmake-rocm-windows.yml

commit 3e1db6900e1a080daac5c6fc7750972be04aeaa8
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 19:55:10 2023 -0500

    Update cmake-rocm-windows.yml

commit 81063b3c56708243cc47063b48a381b9c1e7a88e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Sep 24 19:48:15 2023 -0500

    Update cmake-rocm-windows.yml

commit 32092c0055611c3dc7bfd9fd7a0636f4ad30c7b6
Merge: a45ed4f9 14295922
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Sep 23 14:07:04 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit a45ed4f9920c23503a60f0e0d66366138b8206bd
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 21 15:48:53 2023 -0500

    Update cmake-rocm-windows.yml

commit 2c8269239da521c6cfce21aca6b7cf7bb1941d47
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 21 14:48:27 2023 -0500

    Update cmake-rocm-windows.yml

commit a89ddd3edd14258278e805cfade55af3a23be864
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 21 14:08:28 2023 -0500

    Update cmake-rocm-windows.yml

commit 13924e71102c467fb56c4802305ab9d3c53e431c
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 21 13:18:05 2023 -0500

    Create cmake-rocm-windows.yml

commit 0623f597f33d2fcfc55bc7134294b443e63bde76
Merge: efdd0fc3 712b8423
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 20 13:51:31 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit efdd0fc391b747ce023fc92aaf9c7324959217cd
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Sep 16 03:22:39 2023 -0500

    update version & fix pyinstaller files

commit 7ceec2faaf62f49928685d26b3ef3407e20e467d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Sep 16 01:18:05 2023 -0500

    fixes & add rocm_only exe build file

commit afc6f1008e77084e2c14bd94f44f0d768ca9e84a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Sep 15 19:47:10 2023 -0500

    Separate CuBLAS/hipBLAS

    Separate CuBLAS/hipBLAS

commit 44e952dd01791dfff9df259e4f084a546683d5bf
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 14 15:26:51 2023 -0500

    Update easy_KCPP-ROCm_install.sh

    Remove openblas and CLBlast from this file

commit 262b1c6f2d3fd177070887abc2db900069471429
Author: Johannes Gäßler <johannesg@5d6.de>
Date:   Wed Sep 13 11:20:24 2023 +0200

    CUDA: mul_mat_q RDNA2 tunings (#2910)

    * CUDA: mul_mat_q RDNA2 tunings

    * Update ggml-cuda.cu

    Co-authored-by: Henri Vasserman <henv@hot.ee>

    ---------

    Co-authored-by: Henri Vasserman <henv@hot.ee>

commit e442209c5edf4ed815b78d2289a92e40241affe1
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 13 05:23:56 2023 -0500

    Update koboldcpp.py

commit b5fb4ad6eb043bc5459b57326b657d98526f818a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 13 04:00:28 2023 -0500

    Update .gitignore

commit 29d2cca0b88640d09a4db823026708c51fff79f0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 13 03:07:27 2023 -0500

    changes for windows

commit 5dc22a3b685d03d3a963e7ed3423b52b423b284b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 13 01:30:16 2023 -0500

    cmake update

commit 2a8ffecfccf2add9374767abc7e41224668b43bb
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Sep 13 00:15:45 2023 -0500

    Windows ROCm Support

commit 3d9a25bf37e43997ccf75186bfc722b00472ed08
Merge: 0242966f 2dc96687
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Sep 7 20:45:34 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 0242966f8667c34dc0d631093f7f251f67f66921
Author: kalomaze <66376113+kalomaze@users.noreply.github.com>
Date:   Tue Sep 5 16:46:30 2023 -0500

    Proposed streaming improvements

commit 7aca9b4f4f8ad76141d7651e14110b2f8a7a30a1
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Sep 1 03:23:09 2023 -0500

    better dmmv values

commit ffe2ad3628e7e418e664e937884ab3fcfe496124
Merge: da824e9a b6914ebd
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Aug 31 01:00:42 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit da824e9a9226c8137d0233d9a0a0bb818d3b09c3
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Aug 29 17:26:29 2023 -0500

    Update Makefile for misc amd gpu targeting

    adds the hipBlas gpu_target ``$(shell $(ROCM_PATH)/llvm/bin/amdgpu-arch)`` back to the gpu_target line, possibly allowing misc gpu arch's like gfx1031 or gfx1032 etc to be built

    works in conjunction with the preset targets

commit 48e2d0dce7532cdd80b53093e88d19fe7af022bf
Merge: 0d17408d cf5d9180
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Aug 28 17:52:43 2023 -0500

    Merge branch 'concedo_experimental'

commit 0d17408d4128d996d58517aced644fab0d0a2098
Merge: 3416c986 9d5b4238
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Aug 28 17:46:31 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 3416c986d9d9a31c3cdefd7e7bd4d9438d72ba35
Merge: 5eb17f02 4c4e4358
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Aug 25 13:46:56 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 5eb17f02c8638e003bb91bddf95ccf54d2ad0c12
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Aug 25 13:38:21 2023 -0500

    ROCm Port update

    * use hipblas based on cublas
    * Update Makefile for the Cuda kernels
    * Expand arch list and make it overrideable
    * Fix multi GPU on multiple amd architectures with rocblas_initialize() (#5)
    * add hipBLAS to README
    * new build arg LLAMA_CUDA_MMQ_Y
    * fix half2 decomposition
    * Add intrinsics polyfills for AMD
    * AMD assembly optimized __dp4a
    * Allow overriding CC_TURING
    * use "ROCm" instead of "CUDA"
    * ignore all build dirs
    * Add Dockerfiles
    * fix llama-bench
    * fix -nommq help for non CUDA/HIP

    ---------

    Co-Authored-By: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
    Co-Authored-By: ardfork <134447697+ardfork@users.noreply.github.com>
    Co-Authored-By: funnbot <22226942+funnbot@users.noreply.github.com>
    Co-Authored-By: Engininja2 <139037756+Engininja2@users.noreply.github.com>
    Co-Authored-By: Kerfuffle <44031344+KerfuffleV2@users.noreply.github.com>
    Co-Authored-By: jammm <2500920+jammm@users.noreply.github.com>
    Co-Authored-By: jdecourval <7315817+jdecourval@users.noreply.github.com>

commit b34f4bd2724733e188ec4f6074042f66a5ed28c9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Aug 19 17:12:52 2023 -0500

    Update README.md

commit 7d1196108ad330b32845546fb3472c2172a0b6b8
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Aug 14 23:03:12 2023 -0500

    remove force DMMV

commit cd61aa0d9e16627935c7978adf488a679ddfa745
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Aug 12 17:24:31 2023 -0500

    restore main_gpu parameter

commit 4a042f326830271a4c31104051b7b08e08ac234e
Author: Henri Vasserman <henv@hot.ee>
Date:   Sat Aug 12 10:51:46 2023 +0300

    gfx1100 support

    ---------

    Co-authored-by: ardfork <134447697+ardfork@users.noreply.github.com>
    Co-authored-by: jammm <2500920+jammm@users.noreply.github.com>
    Co-authored-by: jdecourval <7315817+jdecourval@users.noreply.github.com>

commit 8913bc6fea97d3cb860937b0461f455c6abe3ea1
Author: Henri Vasserman <henv@hot.ee>
Date:   Fri Aug 11 10:16:02 2023 +0300

    Allow overriding CC_TURING

commit e77a4c37a756c002e97173f4122e088fb304e18a
Author: Henri Vasserman <henv@hot.ee>
Date:   Fri Aug 11 10:00:07 2023 +0300

    Merge 'origin/master' into hipblas

commit cc4c4e355cd553b1557d5fba2562e824db93f9b4
Author: Engininja2 <139037756+Engininja2@users.noreply.github.com>
Date:   Fri Aug 11 09:43:14 2023 +0300

    New __dp4a assembly

    Now compatible with gfx900 and faster as well.

commit 1a03b709848ce68d5bf5966237756167e2cac540
Author: Henri Vasserman <henv@hot.ee>
Date:   Fri Aug 11 09:30:28 2023 +0300

    Undo mess

    ---------

    Co-authored-by: ardfork <134447697+ardfork@users.noreply.github.com>

commit 4366ff9ba1b1f12e494118ef9b5198479022fcc5
Author: DannyDaemonic <DannyDaemonic@gmail.com>
Date:   Thu Aug 10 13:11:36 2023 -0700

    Handle `ENABLE_VIRTUAL_TERMINAL_PROCESSING` more gracefully on earlier versions of Windows.

commit 811ff855a24323cafddc95c1b8aca711fef05f76
Author: Christian Demsar <crasm@git.vczf.us>
Date:   Thu Aug 10 10:28:27 2023 -0400

    Add --n-predict -2 for stopping generation on full context (#2565)

commit 37c9717aaa6815b6a5be21aaab970212f20fe6bf
Author: Martin Krasser <krasserm@googlemail.com>
Date:   Thu Aug 10 12:16:38 2023 +0200

    Fix grammar-based sampling issue in server (#2566)

commit d18ecd5b9e5dde58ae08a3eef1637406159ddaca
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Aug 10 13:19:41 2023 -0500

    make mmq gen faster for amd

commit 243894a952147a4fac5b6aee748861a0df6cc2c6
Author: Henri Vasserman <henv@hot.ee>
Date:   Thu Aug 10 12:14:40 2023 +0300

    ws fix

commit ac2f14da445ea87d73539adbd29d19ff2c9eba58
Author: Engininja2 <139037756+Engininja2@users.noreply.github.com>
Date:   Thu Aug 10 12:11:27 2023 +0300

    AMD assembly optimized __dp4a

    Doesn't seem to work for gfx900, so commented out.

commit 9dba0c985f140ddded8cbb671f139e81fff82eed
Author: Henri Vasserman <henv@hot.ee>
Date:   Thu Aug 10 12:09:28 2023 +0300

    Fix merge

    ---------

    Co-authored-by: ardfork <134447697+ardfork@users.noreply.github.com>
    Co-authored-by: Kerfuffle <44031344+KerfuffleV2@users.noreply.github.com>

commit f570b5cb1070591527a82d94bba408927b37778d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 22:11:20 2023 -0500

    Revert "revert cuda changes as they are bugggy"

    This reverts commit 1541bf879772aeeed8ff646bfc52185c2a88b79b.

commit 1541bf879772aeeed8ff646bfc52185c2a88b79b
Author: Concedo <39025047+LostRuins@users.noreply.github.com>
Date:   Wed Aug 9 22:36:41 2023 +0800

    revert cuda changes as they are bugggy

commit bacc20203efb1839aa313858a04d75255bb4b7f4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 20:37:17 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit b7cb4cfd109986bd66e8fd382d1e2516eaddfebb
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 20:00:52 2023 -0500

    additional fixes

commit fadae727baa3735ad3e0667384d6e05ca056b3ef
Merge: 518eb2af 8f8ab6c4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 18:45:50 2023 -0500

    Merge branch 'hipblas' into develop4Main

commit 518eb2af9225f8300a108c4244c7eb0a2217c3bc
Merge: bda0215b cae6a847
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 18:32:10 2023 -0500

    Merge remote-tracking branch 'upstream/concedo' into develop2Main

commit bda0215b413bafc49890aa23fc35f96a191fb3e0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 18:17:54 2023 -0500

    update makefile to multisystem path

commit 8f8ab6c4c049df501e9a5ed8fef3aa0fc0691421
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 9 18:05:03 2023 -0500

    hipLDFLAG Path change Unix to multisystem in Makefile

    changed the hardcoded linux distro hipblas LD path from -L/opt/rocm/lib to use the defined ROCM_PATH variable to be flexible with ROCm on non-Linux OS

commit 610ba4cfc460ed65c4adc32d3365a216690384d5
Merge: 4024f91a 25d43e0e
Author: Henri Vasserman <henv@hot.ee>
Date:   Wed Aug 9 23:54:58 2023 +0300

    Merge 'origin/master' into hipblas

commit 4024f91a665d83b6de8658d45ec9d004c5d90c79
Author: Henri Vasserman <henv@hot.ee>
Date:   Wed Aug 9 01:56:44 2023 +0300

    Add intrinsics polyfills for AMD

    ---------

    Co-authored-by: ardfork <134447697+ardfork@users.noreply.github.com>
    Co-authored-by: funnbot <22226942+funnbot@users.noreply.github.com>
    Co-authored-by: Engininja2 <139037756+Engininja2@users.noreply.github.com>

commit ab6212864ce8e9af200bcedb3e0126ee49aa8d0a
Merge: d91456aa f5bfea05
Author: Henri Vasserman <henv@hot.ee>
Date:   Wed Aug 9 00:37:01 2023 +0300

    Merge 'origin/master' into hipblas

commit ee9fa2aca4f2e6645b99702935b34a5f8ec8f05d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Aug 2 01:53:58 2023 -0500

    Update Makefile

commit d91456aaf138566fa0aa3d507964049c8a09499b
Author: ardfork <134447697+ardfork@users.noreply.github.com>
Date:   Mon Jul 31 20:35:00 2023 +0300

    fix half2 decomposition

commit c1cb70d64d307d3fd9b7b9f61bb574e36520499a
Author: Henri Vasserman <henv@hot.ee>
Date:   Mon Jul 31 19:56:44 2023 +0300

    new build arg LLAMA_CUDA_MMQ_Y

commit c1664a00ae98059df863a88cbcb13eeca3025742
Merge: 4336231a 0728c5a8
Author: Henri Vasserman <henv@hot.ee>
Date:   Mon Jul 31 19:32:27 2023 +0300

    Merge 'origin/master' into hipblas

commit 848558d7d95a5036ac057efdefa9b2a2e6fb61b7
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 30 20:02:52 2023 -0500

    import vars logic fix

commit b650b849d52aac65364558521f76e75ded7ea590
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 30 00:21:36 2023 -0500

    Update easy_KCPP-ROCm_install.sh

commit 8573a67a29e813d82e7f032912a8c221cd199505
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 21:31:12 2023 -0500

    remove duplicate code and fix typo

    remove duplicate tooltip

commit 430986e3f68f599fd7a11ea4b2b8e45ef33da643
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 21:07:34 2023 -0500

    hide "missing" if all are built

    move tooltip functions to helper functions section. hides the string "Missing: ..." from showing if all backends are available
    " if len(runopts)==6 else + "

commit dd0db7265dbc0b0699ca861291006808b662b0e4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 20:52:31 2023 -0500

    hide "missing" if all are built

    move tooltip functions to helper functions section. hides the string "Missing: ..." from showing if all backends are available

commit 43fffb66d8a30cbd776c3682f8a104c3644206b1
Merge: 0ed65a44 b40550cf
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 19:13:15 2023 -0500

    Merge branch 'concedo'

commit 0ed65a44a5fdb529611730f276a4b910cbf70ae0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 18:34:21 2023 -0500

    Hide unavailable backends & Add tooltip over backend count

    Hides unavailable backends from the user and if the program is launched without any backends made, it shows an error message to them stating no backends were found and to make them using the 'make' command

    Add tooltip when hovering over backend count label

    hovering over the new label that shows the backend count will explain what the numbers are, and show the users which backends are not available or built

commit 2a263983ab35024a95c411995963182ada06ed6f
Merge: cee2e9d7 31486ebc
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 29 15:16:33 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 4336231a32a0c6168da5d79801752289622e9e58
Author: Henri Vasserman <henv@hot.ee>
Date:   Sat Jul 29 18:35:56 2023 +0300

    add hipBLAS to README

    ---------

    Co-authored-by: ardfork <134447697+ardfork@users.noreply.github.com>

commit f8e3fc6c746b37d69656fb5ae6af8e411d85dbca
Author: Henri Vasserman <henv@hot.ee>
Date:   Sat Jul 29 14:16:46 2023 +0300

    rocblas init stuff

commit d2ade639f4339e786311effb3eafca8bfc360d56
Merge: cde52d6a 8a88e585
Author: Henri Vasserman <henv@hot.ee>
Date:   Sat Jul 29 12:59:48 2023 +0300

    Merge 'origin/master' into hipblas

commit cee2e9d76740fd8e8f50b612078f3e7658460f29
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 26 23:36:55 2023 -0500

    Only Show Available Backends in GUI

    Hides unavailable backends from the user and if the program is launched without any backends made, it shows an error message to them stating no backends were found and to make them using the 'make' command

commit 78636109fc2ded79ee3e9a44d2e3c2d63a8de70e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 26 13:27:22 2023 -0500

    Update easy_KCPP-ROCm_install.sh

commit 731cd6e2ab9bb722e211142bb633e7018ccdb31b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jul 25 22:39:50 2023 -0500

    Create easy_rocm_install.sh

commit f154685bbdc79b5ace752fbc179e32f2f7806bdb
Merge: cbdc1f3f 94e0a06d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Tue Jul 25 22:25:10 2023 -0500

    Merge branch 'concedo_experimentalMAIN'

commit cbdc1f3fb91969e79bc8640e0cebfc3247e200df
Merge: 5b838d47 9731682a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 16:53:21 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit cde52d6a63f13f46d6403cc2957f4b4c34ddf4e2
Merge: 8e8054ad 84e09a7d
Author: Henri Vasserman <henv@hot.ee>
Date:   Mon Jul 24 12:22:58 2023 +0300

    Merge 'origin/master' into hipblas

commit 8e8054ad83e794b261914ad4f337d43e2c76882d
Author: Henri Vasserman <henv@hot.ee>
Date:   Mon Jul 24 12:20:49 2023 +0300

    Add rocblas to build files

commit 1f6294dc4473701b5be791d47e4b3733f95dbc0a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 03:52:01 2023 -0500

    Fix multi GPU on multiple amd architectures with rocblas_initialize() (#5)

    * initialize rocblas

commit 5b838d47874536ebffc2f6cb25877e0476a9402d
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 03:10:35 2023 -0500

    amd multigpu full layer offload w/o vram scratch

commit 9bfb2fdd68000670bda85c4e9748d72f5af09764
Merge: b379f9d6 66328fcd
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 03:07:44 2023 -0500

    Merge branch 'concedo_experimental'

commit b379f9d6fac570c220c928ff5f4ba4ed1ca7c051
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 03:07:00 2023 -0500

    Revert "amd multigpu full layer offload w/o vram scratch"

    This reverts commit 9adfc8e33f7116d6ae2e0992920733f783b70d08.

commit 9adfc8e33f7116d6ae2e0992920733f783b70d08
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 02:56:40 2023 -0500

    amd multigpu full layer offload w/o vram scratch

commit 05c792e622a1d9838f9343e04f79ddf2bb63ae96
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 24 00:18:48 2023 -0500

    initialize rocblas

commit ade68d09d7b63d3344e18b6193043b378671eb12
Merge: 521ad6b5 56995caa
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 23 20:25:05 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 521ad6b5cb2a107ad7b972025aeb0f353e0cac67
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Jul 20 21:42:33 2023 -0500

    lazy import_var error handling for saves

commit 9553e52e7e4eabe46312729f6c4effeef6390df7
Merge: cac66507 f0361091
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Jul 20 19:59:41 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit cac6650754502208abfead61ba169fefc5ae84ac
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 17 23:05:02 2023 -0500

    Makefile fix! Allows hip/clblast build together

commit 3db70b5f0a1a4a1207041ddc5f2c5e25306bad4d
Merge: 2ec4466d 7568d1a2
Author: Henri Vasserman <henv@hot.ee>
Date:   Tue Jul 18 01:54:17 2023 +0300

    Merge 'origin/master' into hipblas

commit f208670ffb6cdbb1e225adfb2fd80a67a6dc5055
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Jul 14 02:56:03 2023 -0500

    improve error handling with gpu names

commit 860e73845f61fe0afb6a26cc8054d8be1f9e3669
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Jul 14 00:33:03 2023 -0500

    Show GPU names in GUI, Only show GPUs that exist

    changed the pre-set 1,2,3 and 1,2,3,all settings that the GPU selector had and replaced them with a function that grabs the GPU names and sets the names as the values for the selector boxes.

commit 2ec4466db54fd2f42f2ab7713cc1061e0cf59bf3
Author: Henri Vasserman <henv@hot.ee>
Date:   Thu Jul 13 13:44:02 2023 +0300

    Update build flags.

    GGML_CUDA_DMMV_Y is now GGML_CUDA_MMV_Y
    so update your build instructions.

    GGML_CUDA_FORCE_DMMV is always enabled.

    ---------

    Co-authored-by: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>

commit cd36b185ff6de91abbfd1b80366dd79a1303a878
Merge: afcb8fe0 1cbf5614
Author: Henri Vasserman <henv@hot.ee>
Date:   Thu Jul 13 13:03:01 2023 +0300

    Merge 'origin/master' into hipblas

commit ac7ebc3ac1deedfbc2940443b26774f1b4c85fae
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 18:32:18 2023 -0500

    add hipBLAS name scheme to GUI and update README

commit 7f85cc5ac30f2f300ca817a489ef209c995c634b
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 17:35:54 2023 -0500

    update makefile and ggml.c

commit 6ca3499275ba168320424f06ab3301ec329a6a83
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 15:43:45 2023 -0500

    ggml.c fix

commit 770e674aa5b2a1a9ffff2888a12e27b04ccfc7ef
Merge: 2b289cde 5941514e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 15:24:36 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 2b289cde558310c6c67dfc8d508c04e634595716
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 14:30:00 2023 -0500

    Update c-cpp.yml

commit 5dae95a9bb486c7f720789dffde1cfb470bffce0
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 14:28:51 2023 -0500

    Update c-cpp.yml

commit b37cd738c84debb53b149f5a9fb73de958f263fd
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 12 14:27:04 2023 -0500

    Create c-cpp.yml to test Actions

commit afcb8fe0c4f5e918422ea41d08824653d58575ed
Author: Henri Vasserman <henv@hot.ee>
Date:   Tue Jul 11 18:09:27 2023 +0300

    Add new config option

commit 8c2c4978a32d671253809d8f0f09d98af2dd18ab
Merge: e6104663 23474632
Author: Henri Vasserman <henv@hot.ee>
Date:   Tue Jul 11 17:53:54 2023 +0300

    Merge 'origin/master' into hipblas

commit e610466307abc8f8bae641682ab3f91dbc33930e
Author: Henri Vasserman <henv@hot.ee>
Date:   Tue Jul 11 17:53:14 2023 +0300

    Expand arch list and make it overrideable

commit 80e4e548bfbace2a966a58cb57dd1720ad7216b2
Merge: 7735c5a9 1d163099
Author: Henri Vasserman <henv@hot.ee>
Date:   Mon Jul 10 02:09:28 2023 +0300

    Merge 'origin/master' into hipblas

commit 8432e9d5dc8d080535243467f8d380271e8d9489
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 9 16:55:30 2023 -0500

    Update Makefile

commit b58c1893fa839c0f35df96f6a8b026a7f2576762
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 9 16:20:00 2023 -0500

    Add multi-gpu CuBLAS support to new GUI

commit 0c1c71b9927127b45030fe88283dfbdd23853d34
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 8 07:56:57 2023 -0500

    Update Makefile

commit f864f60cd8e563e2594cee5a7da7e9aebed494f9
Author: Johannes Gäßler <johannesg@5d6.de>
Date:   Sat Jul 8 00:25:15 2023 +0200

    CUDA: add __restrict__ to mul mat vec kernels (#2140)

commit 4539bc2761a7a23b588b5420b9d3fd1962ff63e5
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 8 01:36:14 2023 -0500

    update makefile for changes

commit 912e31ec523eac9ef308f0d28bc2d93aab7c3ecb
Merge: 74e2703a ddaa4f2a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Fri Jul 7 23:15:37 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 74e2703ac3b1557f107e540657d0919db115f913
Merge: cf65429c f9108ba4
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Wed Jul 5 15:16:49 2023 -0500

    Merge branch 'LostRuins:concedo' into main

commit 7735c5a9af58f6713b54fd5a4b6463f3b116d44d
Merge: c3e3733c 7ee76e45
Author: Henri Vasserman <henv@hot.ee>
Date:   Tue Jul 4 17:09:16 2023 +0300

    Merge 'origin/master' into hipblas

commit cf65429c3832d32a8c17c7ed5ab47066d7511fbe
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 3 16:56:40 2023 -0500

    print cuda or opencl based on what's used

commit 72c16d2310b2e4c44018e2084aeb79e68c0b8709
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 3 16:45:39 2023 -0500

    Revert "fix my mistake that broke other arches"

    This reverts commit 777aed5e69e240a54e7d3da962d8520855f072b9.

commit 777aed5e69e240a54e7d3da962d8520855f072b9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Mon Jul 3 15:53:32 2023 -0500

    fix my mistake that broke other arches

commit 27780a987a8dabb18689038c0397e16f2f219c7e
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 16:03:27 2023 -0500

    rocm fixes

commit f52c7d439770c1ea0bebc1f895b74d6aeea5f0a6
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 16:02:58 2023 -0500

    Revert "rocm fixes"

    This reverts commit 2fe9927353a1e53353623f850d3d534da88f5154.

commit 2fe9927353a1e53353623f850d3d534da88f5154
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 15:58:21 2023 -0500

    rocm fixes

commit efe7560c83a497f5e750bbe27922babd4233bda9
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 15:55:43 2023 -0500

    Revert "move HIPBLAS definitions into ggml-cuda.h"

    This reverts commit bf49a93d63f833b7871ba6e60f8fe207562678ee.

commit 4fc0181e44685019dcd309d4bb345cac7a5fef87
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 15:55:36 2023 -0500

    Revert "move hipblas definitions to header files"

    This reverts commit 2741ffb70464a71fd138484de4b41da05622e027.

commit 89eb576f2771bd81a3a6274348b47535dfdd5f63
Merge: 2741ffb7 3d2907d2
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sun Jul 2 14:44:13 2023 -0500

    Merge branch 'LostRuins:concedo' into main

commit c3e3733c61f7705ea00fd593ee94527da8c12f1b
Author: Henri Vasserman <henv@hot.ee>
Date:   Sun Jul 2 15:51:31 2023 +0300

    ROCm fixes

commit 15db19ae7b70d2a6350063e633b898a89ad78cbc
Merge: 04419f18 46088f72
Author: Henri Vasserman <henv@hot.ee>
Date:   Sun Jul 2 15:39:57 2023 +0300

    Merge 'origin/master' into hipblas

commit 2741ffb70464a71fd138484de4b41da05622e027
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 1 17:07:42 2023 -0500

    move hipblas definitions to header files

commit bf49a93d63f833b7871ba6e60f8fe207562678ee
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 1 16:38:50 2023 -0500

    move HIPBLAS definitions into ggml-cuda.h

commit 540f4e05f4e95378f46a83e2919d3962c0ef9eac
Merge: 2c3b46f8 eda663f1
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Sat Jul 1 14:58:32 2023 -0500

    Merge remote-tracking branch 'upstream/concedo'

commit 2c3b46f8a80ca9d94b2d3d06e1af6b6f7b791914
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Jun 29 18:43:43 2023 -0500

    changes to fix build

commit c9e1103da0d72fd39a36391ac4b5d941a133598a
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Jun 29 18:20:07 2023 -0500

    Update ggml_v2-cuda-legacy.cu for ROCM

commit b858fc5db80ed545a6fbeae3d551bddb47955598
Author: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date:   Thu Jun 29 17:49:39 2023 -0500…
  • Loading branch information
@Nexesenex
Nexesenex committed Jun 14, 2024
1 parent 6f65a8c commit e517cd2
Show file tree
Hide file tree
Showing 13 changed files with 1,064 additions and 118 deletions.
207 changes: 207 additions & 0 deletions .github/workflows/cmake-rocm-windows.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
name: Build Koboldcpp-ROCm Windows

on:
workflow_dispatch:
inputs:
version:
description: 'Version tag of koboldcpp-rocm to build: v1.67.yr0-ROCm'
default: v1.67.yr0-ROCm
required: false
type: string
workflow_call:
inputs:
version:
description: 'Version tag of koboldcpp-rocm to build: v1.67.yr0-ROCm'
default: v1.67.yr0-ROCm
required: false
type: string

permissions:
contents: write

jobs:
build_libs:
name: Build ROCm Lib
runs-on: windows-latest
defaults:
run:
shell: pwsh

steps:
- uses: actions/checkout@v3
with:
repository: 'YellowRoseCx/koboldcpp-rocm'
ref: main
submodules: 'recursive'

- name: Setup MSYS2
uses: msys2/setup-msys2@v2
with:
update: true
install: >-
base-devel
mingw-w64-x86_64-toolchain
- name: Build CLBLAST & Others with make
run: |
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
Get-Location
ls
make CC=gcc LLAMA_CLBLAST=1 LLAMA_OPENBLAS=1 LLAMA_VULKAN=1 -j2
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2

- name: Install ROCm SDK
run: |
curl -LO https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-23.Q4-Win10-Win11-For-HIP.exe
Start-Process 'AMD-Software-PRO-Edition-23.Q4-Win10-Win11-For-HIP.exe' -ArgumentList '-install' -NoNewWindow -Wait
echo "C:\Program Files\AMD\ROCm\5.7\bin" >> $env:GITHUB_PATH
echo 'ROCM_PATH=C:\Program Files\AMD\ROCm\5.7' >> $env:GITHUB_ENV
echo 'HIP_PATH=C:\Program Files\AMD\ROCm\5.7' >> $env:GITHUB_ENV
echo "ROCM_VERSION=5.7.1" >> $env:GITHUB_ENV
- uses: actions/setup-python@v3
with:
python-version: "3.10"

- name: Install Dependencies
run: |
python -m pip install cmake ninja
- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v2
with:
version: "18.1.4"
force-url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/LLVM-18.1.4-win64.exe"

- name: Install PyInstaller
run: pip install pyinstaller==6.4.0 psutil

- name: Build Lib
run: |
Set-Location 'C:\Program Files\AMD\ROCm\5.7\bin'
Get-Location
curl -LO https://github.com/YellowRoseCx/koboldcpp-rocm/releases/download/v1.43.2-ROCm/gfx103132rocblasfiles.zip
7z x gfx103132rocblasfiles.zip
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
$env:CC = 'C:\Program Files\AMD\ROCm\5.7\bin\clang.exe'
$env:CXX = 'C:\Program Files\AMD\ROCm\5.7\bin\clang++.exe'
$env:CMAKE_PREFIX_PATH = 'C:\Program Files\AMD\ROCm\5.7'
$env:VERBOSE = '1'
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
mkdir 'build'
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build'
Get-Location
cmake --version
clang --version
cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DLLAMA_HIPBLAS=ON -DHIP_PLATFORM=amd -DAMDGPU_TARGETS="gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
# -DCMAKE_C_COMPILER="C:\Program Files\AMD\ROCm\5.7\bin\clang.exe" -DCMAKE_CXX_COMPILER="C:\Program Files\AMD\ROCm\5.7\bin\clang++.exe"
- name: Copy ROCm DLLs and Run PyInstaller
run: |
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
Get-Location
copy "C:\Program Files\AMD\ROCm\5.7\bin\hipblas.dll" .\
copy "C:\Program Files\AMD\ROCm\5.7\bin\rocblas.dll" .\
robocopy "C:\Program Files\AMD\ROCm\5.7\bin\rocblas" .\rocblas /MIR
pip install customtkinter
PyInstaller --noconfirm --onefile --collect-all customtkinter --clean --console --icon ".\niko.ico" --add-data "./klite.embd;." --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./kcpp_docs.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll;." --add-data "./hipblas.dll;." --add-data "./rocblas.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." --add-data "./rocblas;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp_rocm.exe"
- name: Create ZIP archive
run: |
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
Compress-Archive -Path D:\a\koboldcpp-rocm\koboldcpp-rocm\klite.embd, D:\a\koboldcpp-rocm\koboldcpp-rocm\winclinfo.exe, D:\a\koboldcpp-rocm\koboldcpp-rocm\OpenCL.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\kcpp_docs.embd, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_default.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_openblas.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_failsafe.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_noavx2.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\libopenblas.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_vulkan.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_clblast.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp_clblast_noavx2.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\clblast.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\hipblas.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\rocblas.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\rwkv_vocab.embd, D:\a\koboldcpp-rocm\koboldcpp-rocm\rwkv_world_vocab.embd, D:\a\koboldcpp-rocm\koboldcpp-rocm\rocblas, D:\a\koboldcpp-rocm\koboldcpp-rocm\msvcp140.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\vcruntime140_1.dll, D:\a\koboldcpp-rocm\koboldcpp-rocm\koboldcpp.py -DestinationPath koboldcpp_rocm_files.zip
copy "koboldcpp_rocm_files.zip" D:\a\koboldcpp-rocm\koboldcpp-rocm\dist
- uses: actions/upload-artifact@v4.3.3
with:
name: koboldcpp_hipblas-${{ inputs.version }}
path: D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll

- uses: actions/upload-artifact@v4.3.3
with:
name: koboldcpp_rocm_only-${{ inputs.version }}
path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm.exe

- uses: actions/upload-artifact@v4.3.3
with:
name: koboldcpp_rocm_zip-${{ inputs.version }}
path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm_files.zip

- name: Upload files to a GitHub release
id: upload-release
uses: svenstaro/upload-release-action@2.9.0
continue-on-error: true
with:
file_glob: true
file: D:/a/koboldcpp-rocm/koboldcpp-rocm/dist/*.*
release_name: KoboldCPP-${{ inputs.version }}
tag: ${{ inputs.version }}
make_latest: true
prerelease: true
overwrite: false




# Copy-Item 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll' '..\..\build'
# build_wheel:
# name: Build ROCm
# runs-on: windows-latest
# needs: build_libs
# strategy:
# matrix:
# pyver: ["3.8", "3.9", "3.10", "3.11"]
# defaults:
# run:
# shell: pwsh
# env:
# PCKGVER: ${{ inputs.version }}

# steps:
# - uses: actions/checkout@v3
# with:
# repository: 'YellowRoseCx/koboldcpp-rocm'
# ref: ${{ inputs.version }}

# - uses: actions/download-artifact@v3
# with:
# name: 'win-rocm-lib'
# path: ./koboldcpp-rocm

# - uses: actions/setup-python@v3
# with:
# python-version: ${{ matrix.pyver }}

# - name: Install Dependencies
# run: |
# python -m pip install build wheel cmake scikit-build ninja

# - name: Build Wheel
# run: |
# $packageVersion = [version]$env:PCKGVER.TrimStart('v')
# $setup = Get-Content 'setup.py' -raw
# if ($packageVersion -lt [version]'0.1.78') {$newsetup = $setup.Replace("packages=[`"llama_cpp`", `"llama_cpp.server`"],","packages=[`"llama_cpp`", `"llama_cpp.server`"],`n package_data={'llama_cpp': ['llama.dll']},")}
# if ($packageVersion -gt [version]'0.1.77') {$newsetup = $setup.Replace('package_data={"llama_cpp": ["py.typed"]},','package_data={"llama_cpp": ["py.typed", "llama.dll"]},')}
# New-Item 'setup.py' -itemType File -value $newsetup -force
# python setup.py --skip-cmake bdist_wheel egg_info --tag-build=+rocm5.5.1

# - name: Upload files to a GitHub release
# id: upload-release
# uses: svenstaro/upload-release-action@2.6.1
# continue-on-error: true
# with:
# file: ./dist/*.whl
# tag: rocm
# file_glob: true
# make_latest: false
# overwrite: true

# - uses: actions/upload-artifact@v3
# if: steps.upload-release.outcome == 'failure'
# with:
# name: 'win-rocm-wheels'
# path: ./dist/*.whl
12 changes: 6 additions & 6 deletions .github/workflows/code-coverage.yml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: Code Coverage
on: [push, pull_request]
#on: [push, pull_request]
on:
pull_request:
branches:
- master

env:
GGML_NLOOP: 3
GGML_N_THREADS: 1

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
cancel-in-progress: true

jobs:
run:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Dependencies
run: |
Expand Down
146 changes: 146 additions & 0 deletions .github/workflows/tests-rocm-windows.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
name: Test Build Koboldcpp-ROCm Windows

on:
workflow_dispatch:
inputs:
version:
description: 'Version tag of koboldcpp-rocm to test: v1.51.0.yr0-ROCm'
default: v1.51.0.yr0-ROCm
required: false
type: string
workflow_call:
inputs:
version:
description: 'Version tag of koboldcpp-rocm to test: v1.51.0.yr0-ROCm'
default: v1.51.0.yr0-ROCm
required: false
type: string

permissions:
contents: write

jobs:
build_libs:
name: Test Build ROCm Lib
runs-on: windows-latest
defaults:
run:
shell: pwsh

steps:
- uses: actions/checkout@v3
with:
repository: 'YellowRoseCx/koboldcpp-rocm'
ref: main
submodules: 'recursive'

- name: Setup MSYS2
uses: msys2/setup-msys2@v2
with:
update: true
install: >-
base-devel
mingw-w64-x86_64-toolchain
- name: Build CLBLAST & Others with make
run: |
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
Get-Location
ls
make CC=gcc LLAMA_CLBLAST=1 LLAMA_OPENBLAS=1 -j2
- name: Install ROCm SDK
run: |
curl -LO https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-23.Q4-Win10-Win11-For-HIP.exe
Start-Process 'AMD-Software-PRO-Edition-23.Q4-Win10-Win11-For-HIP.exe' -ArgumentList '-install' -NoNewWindow -Wait
echo "C:\Program Files\AMD\ROCm\5.7\bin" >> $env:GITHUB_PATH
echo 'ROCM_PATH=C:\Program Files\AMD\ROCm\5.7' >> $env:GITHUB_ENV
echo 'HIP_PATH=C:\Program Files\AMD\ROCm\5.7' >> $env:GITHUB_ENV
echo "ROCM_VERSION=5.7.1" >> $env:GITHUB_ENV
- uses: actions/setup-python@v3
with:
python-version: "3.10"

- name: Install Dependencies
run: |
python -m pip install cmake ninja
- name: Install PyInstaller
run: pip install pyinstaller psutil

- name: Test Build Lib
run: |
$env:CC = 'C:\Program Files\AMD\ROCm\5.7\bin\clang.exe'
$env:CXX = 'C:\Program Files\AMD\ROCm\5.7\bin\clang++.exe'
$env:CMAKE_PREFIX_PATH = 'C:\Program Files\AMD\ROCm\5.7'
$env:VERBOSE = '1'
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
mkdir 'build'
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build'
Get-Location
cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DLLAMA_HIPBLAS=ON -DHIP_PLATFORM=amd -DCMAKE_C_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang.exe" -DCMAKE_CXX_COMPILER="C:/Program Files/AMD/ROCm/5.7/bin/clang++.exe" -DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102"
cmake --build . -j2
- name: Copy ROCm DLLs and Run PyInstaller
run: |
Set-Location 'D:\a\koboldcpp-rocm\koboldcpp-rocm'
Get-Location
copy "C:\Program Files\AMD\ROCm\5.7\bin\hipblas.dll" .\
copy "C:\Program Files\AMD\ROCm\5.7\bin\rocblas.dll" .\
robocopy "C:\Program Files\AMD\ROCm\5.7\bin\rocblas" .\rocblas /MIR
pip install customtkinter
PyInstaller --noconfirm \
--onefile \
--collect-all customtkinter \
--clean \
--console \
--icon ".\niko.ico" \
--add-data "./klite.embd;." \
--add-data "./winclinfo.exe;." \
--add-data "./OpenCL.dll;." \
--add-data "./kcpp_docs.embd;." \
--add-data "./koboldcpp_default.dll;." \
--add-data "./koboldcpp_openblas.dll;." \
--add-data "./koboldcpp_failsafe.dll;." \
--add-data "./koboldcpp_noavx2.dll;." \
--add-data "./libopenblas.dll;." \
--add-data "./koboldcpp_clblast.dll;." \
--add-data "./koboldcpp_clblast_noavx2.dll;." \
--add-data "./clblast.dll;." \
--add-data "D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll;." \
--add-data "./hipblas.dll;." \
--add-data "./rocblas.dll;." \
--add-data "./rwkv_vocab.embd;." \
--add-data "./rwkv_world_vocab.embd;." \
--add-data "./rocblas;." \
--add-data "C:/Windows/System32/msvcp140.dll;." \
--add-data "C:/Windows/System32/vcruntime140_1.dll;." \
"./koboldcpp.py" \
-n "koboldcpp_rocm.exe"
# curl -LO https://github.com/YellowRoseCx/koboldcpp-rocm/releases/download/v1.43.2-ROCm/gfx103132rocblasfiles.7z
# 7z x gfx103132rocblasfiles.7z

- uses: actions/upload-artifact@v3
with:
name: koboldcpp_hipblas-${{ inputs.version }}
path: D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll

- uses: actions/upload-artifact@v3
with:
name: koboldcpp_rocm-${{ inputs.version }}
path: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm.exe

# - name: Upload files to a GitHub release
# id: upload-release
# uses: svenstaro/upload-release-action@2.6.1
# continue-on-error: true
# with:
# file: D:\a\koboldcpp-rocm\koboldcpp-rocm\dist\koboldcpp_rocm_only.exe
# release_name: KoboldCPP-${{ inputs.version }}
# tag: ${{ inputs.version }}
# file_glob: false
# make_latest: true
# overwrite: false

# Copy-Item 'D:\a\koboldcpp-rocm\koboldcpp-rocm\build\bin\koboldcpp_hipblas.dll' '..\..\build'
Loading

0 comments on commit e517cd2

Please sign in to comment.