From 942fb4b413339b5045a0e699e12469ea4b7b3f92 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:26:45 +0800 Subject: [PATCH] fixed removed ref (+1 squashed commits) Squashed commits: [93f3c270] fixed removed ref (+1 squashed commits) Squashed commits: [df361250] remove some files --- .github/workflows/close-issue.yml | 23 ----- .github/workflows/server.yml | 151 ------------------------------ CMakeLists.txt | 1 - common/CMakeLists.txt | 84 ----------------- otherarch/llama-util.h | 6 +- 5 files changed, 3 insertions(+), 262 deletions(-) delete mode 100644 .github/workflows/close-issue.yml delete mode 100644 .github/workflows/server.yml delete mode 100644 common/CMakeLists.txt diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml deleted file mode 100644 index a151c6780..000000000 --- a/.github/workflows/close-issue.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Close inactive issues -on: - schedule: - - cron: "42 0 * * *" - -jobs: - close-issues: - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - steps: - - uses: actions/stale@v5 - with: - exempt-issue-labels: "refactor,help wanted,good first issue,research" - days-before-issue-stale: 30 - days-before-issue-close: 14 - stale-issue-label: "stale" - close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale." - days-before-pr-stale: -1 - days-before-pr-close: -1 - operations-per-run: 1000 - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml deleted file mode 100644 index 65ca7d9ca..000000000 --- a/.github/workflows/server.yml +++ /dev/null @@ -1,151 +0,0 @@ -# Server build and tests -name: Server - -on: - workflow_dispatch: # allows manual triggering - inputs: - slow_tests: - description: 'Run slow tests' - required: true - type: boolean - push: - branches: - - master - paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'examples/server/tests/**.*'] - pull_request: - types: [opened, synchronize, reopened] - paths: ['.github/workflows/server.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.swift', '**/*.m', 'examples/server/tests/**.*'] - schedule: - - cron: '0 0 * * *' - -jobs: - server: - runs-on: ubuntu-latest - - strategy: - matrix: - # TODO: temporary disabled due to linux kernel issues - #sanitizer: [ADDRESS, THREAD, UNDEFINED] - sanitizer: [UNDEFINED] - build_type: [Debug] - include: - - build_type: Release - sanitizer: "" - disabled_on_pr: true - fail-fast: false # While -DLLAMA_SANITIZE_THREAD=ON is broken - - container: - image: ubuntu:latest - ports: - - 8888 - options: --cpus 4 - - steps: - - name: Clone - id: checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Dependencies - id: depends - run: | - apt-get update - apt-get -y install \ - build-essential \ - git \ - cmake \ - python3-pip \ - wget \ - language-pack-en \ - libcurl4-openssl-dev - - - name: Build - id: cmake_build - run: | - mkdir build - cd build - cmake .. \ - -DLLAMA_NATIVE=OFF \ - -DLLAMA_BUILD_SERVER=ON \ - -DLLAMA_CURL=ON \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ - -DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON ; - cmake --build . --config ${{ matrix.build_type }} -j $(nproc) --target server - - - name: Tests dependencies - id: test_dependencies - run: | - pip install -r examples/server/tests/requirements.txt - - - name: Tests - id: server_integration_tests - if: ${{ !matrix.disabled_on_pr || !github.event.pull_request }} - run: | - cd examples/server/tests - PORT=8888 ./tests.sh - - - name: Slow tests - id: server_integration_tests_slow - if: ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }} - run: | - cd examples/server/tests - PORT=8888 ./tests.sh --stop --no-skipped --no-capture --tags slow - - - server-windows: - runs-on: windows-latest - - steps: - - name: Clone - id: checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: libCURL - id: get_libcurl - env: - CURL_VERSION: 8.6.0_6 - run: | - curl.exe -o $env:RUNNER_TEMP/curl.zip -L "https://curl.se/windows/dl-${env:CURL_VERSION}/curl-${env:CURL_VERSION}-win64-mingw.zip" - mkdir $env:RUNNER_TEMP/libcurl - tar.exe -xvf $env:RUNNER_TEMP/curl.zip --strip-components=1 -C $env:RUNNER_TEMP/libcurl - - - name: Build - id: cmake_build - run: | - mkdir build - cd build - cmake .. -DLLAMA_CURL=ON -DCURL_LIBRARY="$env:RUNNER_TEMP/libcurl/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:RUNNER_TEMP/libcurl/include" - cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target server - - - name: Python setup - id: setup_python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: Tests dependencies - id: test_dependencies - run: | - pip install -r examples/server/tests/requirements.txt - - - name: Copy Libcurl - id: prepare_libcurl - run: | - cp $env:RUNNER_TEMP/libcurl/bin/libcurl-x64.dll ./build/bin/Release/libcurl-x64.dll - - - name: Tests - id: server_integration_tests - if: ${{ !matrix.disabled_on_pr || !github.event.pull_request }} - run: | - cd examples/server/tests - behave.exe --summary --stop --no-capture --exclude 'issues|wrong_usages|passkey' --tags llama.cpp - - - name: Slow tests - id: server_integration_tests_slow - if: ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }} - run: | - cd examples/server/tests - behave.exe --stop --no-skipped --no-capture --tags slow diff --git a/CMakeLists.txt b/CMakeLists.txt index e480db331..6ff396836 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,6 @@ option(LLAMA_CUDA_F16 "llama: use 16 bit floats for dmmv set(LLAMA_CUDA_KQUANTS_ITER "2" CACHE STRING "llama: iters./thread per block for Q2_K/Q6_K") set(LLAMA_CUDA_PEER_MAX_BATCH_SIZE "128" CACHE STRING "llama: max. batch size for using peer access") -option(LLAMA_CURL "llama: use libcurl to download model from an URL" OFF) option(LLAMA_HIPBLAS "llama: use hipBLAS" OFF) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt deleted file mode 100644 index af2629a46..000000000 --- a/common/CMakeLists.txt +++ /dev/null @@ -1,84 +0,0 @@ -# common - - -# Build info header -# - -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.git") - set(GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../.git") - - # Is git submodule - if(NOT IS_DIRECTORY "${GIT_DIR}") - file(READ ${GIT_DIR} REAL_GIT_DIR_LINK) - string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" REAL_GIT_DIR ${REAL_GIT_DIR_LINK}) - string(FIND "${REAL_GIT_DIR}" "/" SLASH_POS) - if (SLASH_POS EQUAL 0) - set(GIT_DIR "${REAL_GIT_DIR}") - else() - set(GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${REAL_GIT_DIR}") - endif() - endif() - - if(EXISTS "${GIT_DIR}/index") - set(GIT_INDEX "${GIT_DIR}/index") - else() - message(WARNING "Git index not found in git repository.") - set(GIT_INDEX "") - endif() -else() - message(WARNING "Git repository not found; to enable automatic generation of build info, make sure Git is installed and the project is a Git repository.") - set(GIT_INDEX "") -endif() - -# Add a custom command to rebuild build-info.cpp when .git/index changes -add_custom_command( - OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/build-info.cpp" - COMMENT "Generating build details from Git" - COMMAND ${CMAKE_COMMAND} -DMSVC=${MSVC} -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION} - -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DCMAKE_VS_PLATFORM_NAME=${CMAKE_VS_PLATFORM_NAME} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -P "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/gen-build-info-cpp.cmake" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.." - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/build-info.cpp.in" ${GIT_INDEX} - VERBATIM -) -set(TARGET build_info) -add_library(${TARGET} OBJECT build-info.cpp) -if (BUILD_SHARED_LIBS) - set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON) -endif() - - -set(TARGET common) - -add_library(${TARGET} STATIC - base64.hpp - common.h - common.cpp - sampling.h - sampling.cpp - console.h - console.cpp - grammar-parser.h - grammar-parser.cpp - train.h - train.cpp - ) - -if (BUILD_SHARED_LIBS) - set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON) -endif() - -set(LLAMA_COMMON_EXTRA_LIBS build_info) - -# Use curl to download model url -if (LLAMA_CURL) - find_package(CURL REQUIRED) - add_definitions(-DLLAMA_USE_CURL) - include_directories(${CURL_INCLUDE_DIRS}) - find_library(CURL_LIBRARY curl REQUIRED) - set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} ${CURL_LIBRARY}) -endif () - -target_include_directories(${TARGET} PUBLIC .) -target_compile_features(${TARGET} PUBLIC cxx_std_11) -target_link_libraries(${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama) diff --git a/otherarch/llama-util.h b/otherarch/llama-util.h index 948da5a88..fc0d31404 100644 --- a/otherarch/llama-util.h +++ b/otherarch/llama-util.h @@ -505,7 +505,7 @@ struct llama_v3_buffer { }; #ifdef GGML_USE_CUBLAS -#include "ggml-cuda.h" +#include "ggml_v3-cuda.h" struct llama_v3_ctx_buffer { uint8_t * addr = NULL; bool is_cuda; @@ -516,7 +516,7 @@ struct llama_v3_ctx_buffer { void resize(size_t size) { free(); - addr = (uint8_t *) ggml_cuda_host_malloc(size); + addr = (uint8_t *) ggml_v3_cuda_host_malloc(size); if (addr) { is_cuda = true; } @@ -531,7 +531,7 @@ struct llama_v3_ctx_buffer { void free() { if (addr) { if (is_cuda) { - ggml_cuda_host_free(addr); + ggml_v3_cuda_host_free(addr); } else { delete[] addr;