Cleanup: remove FastBinarySearch (#1817)

Author: matthewdouglas

CMakeLists.txt

@@ -23,7 +23,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Define included source files
-set(CPP_FILES csrc/common.cpp csrc/cpu_ops.cpp csrc/pythonInterface.cpp)
+set(CPP_FILES csrc/cpu_ops.cpp csrc/pythonInterface.cpp)
 set(CUDA_FILES csrc/ops.cu csrc/kernels.cu)
 set(HIP_FILES csrc/ops.hip csrc/kernels.hip)
 set(MPS_FILES csrc/mps_ops.mm)
@@ -158,7 +158,6 @@ if(BUILD_CUDA)
     string(APPEND CMAKE_CUDA_FLAGS " --use_fast_math")
 
     if(PTXAS_VERBOSE)
-        # Verbose? Outputs register usage information, and other things...
         string(APPEND CMAKE_CUDA_FLAGS " -Xptxas=-v")
     endif()
 
@@ -268,7 +267,7 @@ endif()
 set_source_files_properties(${CPP_FILES} PROPERTIES LANGUAGE CXX)
 add_library(bitsandbytes SHARED ${SRC_FILES})
 target_compile_features(bitsandbytes PUBLIC cxx_std_17)
-target_include_directories(bitsandbytes PUBLIC csrc include)
+target_include_directories(bitsandbytes PUBLIC csrc)
 
 if (BUILD_CPU)
     if (OpenMP_CXX_FOUND)

NOTICE.md

@@ -1,3 +1 @@
-The majority of bitsandbytes is licensed under MIT, however portions of the project are available under separate license terms: Pytorch is licensed under the BSD license.
-
-We thank Fabio Cannizzo for this work on FastBinarySearch which is included in this project.
+The majority of bitsandbytes is licensed under MIT, however portions of the project are available under separate license terms: PyTorch is licensed under the BSD license.

README.md

@@ -181,8 +181,6 @@ The continued maintenance and development of `bitsandbytes` is made possible tha
 ## License
 `bitsandbytes` is MIT licensed.
 
-We thank Fabio Cannizzo for his work on [FastBinarySearch](https://github.com/fabiocannizzo/FastBinarySearch) which we use for CPU quantization.
-
 ## How to cite us
 If you found this library useful, please consider citing our work:
 

csrc/common.cpp

@@ -1,28 +1,7 @@
-#include <BinSearch.h>
-
-#ifndef common
-#define common
-
-using namespace BinSearch;
+#pragma once
 
 typedef enum DataType_t {
     General8bit = 0,
     FP4 = 1,
     NF4 = 2,
 } DataType_t;
-
-struct quantize_block_args {
-    BinAlgo<Scalar, float, Direct2>* bin_searcher;
-    float* code;
-    float* A;
-    float* absmax;
-    unsigned char* out;
-    long long block_end;
-    long long block_idx;
-    long long threadidx;
-    long long blocksize;
-};
-
-void quantize_block(const quantize_block_args& args);
-
-#endif

csrc/common.h

@@ -1,9 +1,8 @@
-#include <BinSearch.h>
-#include <cpu_ops.h>
-#include <thread>
-
+#include "cpu_ops.h"
 #include <algorithm>
 #include <cmath>
+#include <cstdio>
+#include <thread>
 #include <vector>
 
 #ifdef HAS_OPENMP

csrc/cpu_ops.cpp

@@ -1,9 +1,9 @@
 #ifndef BITSANDBYTES_CPU_OPS_H
 #define BITSANDBYTES_CPU_OPS_H
 
+#include "common.h"
 #include <algorithm>
 #include <cmath>
-#include <common.h>
 #include <cstdint>
 #include <cstring>
 #include <thread>

csrc/cpu_ops.h

@@ -3,7 +3,6 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include <BinSearch.h>
 #include <cassert>
 #include <cub/device/device_scan.cuh>
 #include <kernels.cuh>
@@ -12,7 +11,6 @@
 
 #define ERR_NOT_IMPLEMENTED 100
 
-using namespace BinSearch;
 using std::cout;
 using std::endl;
 

csrc/mps_ops.h

@@ -15,13 +15,11 @@
 #include <hipblaslt/hipblaslt.h>
 #endif
 #include <limits>
-#include <BinSearch.h>
 #include <cassert>
 #include <common.h>
 
 #define ERR_NOT_IMPLEMENTED 100
 
-using namespace BinSearch;
 using std::cout;
 using std::endl;