Fix mkl and add PLSH

.github/workflows/cmake.yml

@@ -2,7 +2,7 @@ name: CMake
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, fix-mkl ]
   pull_request:
     branches: [ main ]
 

.gitmodules

@@ -14,3 +14,7 @@
 	path = IP-DiskANN
 	url = https://github.com/intellistream/IP-DiskANN.git
 	branch = main
+[submodule "PLSH"]
+	path = PLSH
+	url = https://github.com/Kwan-Yiu/PLSH.git
+	branch = master

CMakeLists.txt

@@ -370,8 +370,14 @@ target_include_directories(CANDYBENCH PUBLIC "include")
 #endif ()
 
 # 设置 MKL 库的路径
-set(MKL_INCLUDE_DIR "/opt/intel/oneapi/mkl/2025.2/include")
-set(MKL_LIB_DIR "/opt/intel/oneapi/mkl/2025.2/lib/intel64")
+# 优先使用环境变量 MKLROOT，如果未设置则使用默认路径
+if(DEFINED ENV{MKLROOT})
+    set(MKL_INCLUDE_DIR "$ENV{MKLROOT}/include")
+    set(MKL_LIB_DIR "$ENV{MKLROOT}/lib/intel64")
+else()
+    set(MKL_INCLUDE_DIR "/opt/intel/oneapi/mkl/latest/include")
+    set(MKL_LIB_DIR "/opt/intel/oneapi/mkl/latest/lib/intel64")
+endif()
 
 #set(MPI_INCLUDE_PATH "/usr/include/openmpi-x86_64")
 #set(MPI_LIBRARIES "/usr/lib/x86_64-linux-gnu/openmpi/lib/libmpi.so")

Dockerfile

@@ -51,6 +51,8 @@ RUN wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-P
 
 ENV MKLROOT=/opt/intel/oneapi/mkl/latest
 ENV LD_LIBRARY_PATH=${MKLROOT}/lib:${MKLROOT}/lib/intel64:${LD_LIBRARY_PATH}
+ENV CPATH=${MKLROOT}/include:${CPATH}
+ENV LIBRARY_PATH=${MKLROOT}/lib:${MKLROOT}/lib/intel64:${LIBRARY_PATH}
 
 
 RUN pip install --no-cache-dir \
@@ -85,6 +87,11 @@ RUN mkdir -p build && cd build && \
      cmake .. && \
      make -j && make install
 
+WORKDIR /app/PLSH
+RUN mkdir -p build && cd build && \
+    cmake .. && \
+    make -j && make install
+
 WORKDIR /app/big-ann-benchmarks
 RUN pip install -r requirements_py3.10.txt && \
     git clone https://github.com/Microsoft/DiskANN && \