From 16cb012711bb3b682b01bb58ccfae68e17cae753 Mon Sep 17 00:00:00 2001
From: MingqiWang-coder <15751853706@163.com>
Date: Thu, 6 Nov 2025 19:20:19 +0800
Subject: [PATCH 1/5] Update the Dockerfile and optimize the build process

---
 CMakeLists.txt | 10 ++++++++--
 Dockerfile     |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ad2e9006..875ca8e88 100644
--- a/CMakeLists.txt
+++ b/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")
diff --git a/Dockerfile b/Dockerfile
index 7e9dd909c..1bd070736 100644
--- a/Dockerfile
+++ b/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 \

From 2370da55116c855bc937b4f109dde32c5ac34821 Mon Sep 17 00:00:00 2001
From: MingqiWang-coder <15751853706@163.com>
Date: Thu, 6 Nov 2025 19:24:16 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20CMake=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index e8193192e..f650c8a2a 100755
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -2,7 +2,7 @@ name: CMake
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, fix-mkl ]
   pull_request:
     branches: [ main ]
 

From 7b7e800de5031b0e279a9e421991a544cf8ba043 Mon Sep 17 00:00:00 2001
From: MingqiWang-coder <15751853706@163.com>
Date: Thu, 6 Nov 2025 19:46:41 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0PLSH=E5=AD=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules | 4 ++++
 Dockerfile  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 617359b69..0d712dc06 100644
--- a/.gitmodules
+++ b/.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
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 1bd070736..7d14679a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,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 && \

From c0422098852264036f5e53ebb7ccc0cf165b7ab0 Mon Sep 17 00:00:00 2001
From: MingqiWang-coder <15751853706@163.com>
Date: Thu, 6 Nov 2025 20:00:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PLSH=E5=AD=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PLSH | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 PLSH

diff --git a/PLSH b/PLSH
new file mode 160000
index 000000000..0d033a400
--- /dev/null
+++ b/PLSH
@@ -0,0 +1 @@
+Subproject commit 0d033a400f9fb533dbd9fb014153f6cb151fc0c5

From 79dd4ed2eb0fce6fcf6764a1f6d7ca4ea584113e Mon Sep 17 00:00:00 2001
From: MingqiWang-coder <15751853706@163.com>
Date: Thu, 6 Nov 2025 20:34:24 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20big-ann-benchmarks=20?=
 =?UTF-8?q?=E5=AD=90=E6=A8=A1=E5=9D=97=E5=88=B0=E6=9C=80=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 big-ann-benchmarks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/big-ann-benchmarks b/big-ann-benchmarks
index 9e34ab58e..2b5075e8c 160000
--- a/big-ann-benchmarks
+++ b/big-ann-benchmarks
@@ -1 +1 @@
-Subproject commit 9e34ab58e9ac227a4b9d0d227567974f27089846
+Subproject commit 2b5075e8c3eaf0f88511e16634eca7fa76caeb3c