1. modify scripts

.gitignore

@@ -32,6 +32,7 @@
 *.app
 *build
 __pycache*/
+doc/
 /cmake-build-debug/
 /cmake-build-debug/_deps/
 /cmake-build-release/

CMakeLists.txt

@@ -13,11 +13,7 @@ include(cmake/default.cmake)
 #set(CMAKE_CXX_STANDARD 20)
 #set(CMAKE_CXX_STANDARD_REQUIRED ON)
 #gcc 10 g++10
-message(STATUS "sudo add-apt-repository 'deb http://mirrors.kernel.org/ubuntu hirsute main universe'")
-message(STATUS "sudo apt-get update")
-message(STATUS "sudo apt install gcc-11 g++-11")
-message(STATUS "sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11")
-message(STATUS "sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11")
+
 
 find_package(Torch REQUIRED)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")

benchmark/scripts/scanARow/config_BCoAMM.csv

@@ -0,0 +1,6 @@
+key,value,type
+aRow,100,U64
+aCol,1000,U64
+bCol,500,U64
+sketchDimension,25,U64
+ptFile,torchscripts/BetaCoOccurringFD.pt,String

benchmark/scripts/scanARow/config_CoAMM.csv

@@ -0,0 +1,6 @@
+key,value,type
+aRow,100,U64
+aCol,1000,U64
+bCol,500,U64
+sketchDimension,25,U64
+ptFile,torchscripts/CoOccurringFD.pt,String

benchmark/scripts/scanARow/drawTogether.py

@@ -81,7 +81,9 @@ def readResultSingle(singleValue, resultPath):
     cacheRefs = readConfig(resultFname, "cacheRefs")
     return elapsedTime, cacheMiss, cacheRefs
 
-
+def cleanPath(path):
+    os.system("sudo rm -rf " + path)
+    os.system("sudo mkdir " + path)
 def readResultVector(singleValueVec, resultPath):
     elapseTimeVec = []
     cacheMissVec = []
@@ -98,6 +100,8 @@ def main():
     exeSpace = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/"
     resultPath = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/results/" + scanTag
     resultPathFDAMM = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/results/" + scanTag+"/FDAMM"
+    resultPathCoFD = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/results/" + scanTag+"/CoFD"
+    resultPathBetaCoFD = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/results/" + scanTag+"/BCoFD"
     resultPathRAWMM = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/results/" + scanTag+"/RAWMM"
     figPath = os.path.abspath(os.path.join(os.getcwd(), "../..")) + "/figures/" + scanTag
     configTemplate = exeSpace + "config.csv"
@@ -112,22 +116,28 @@ def main():
         os.system("sudo rm -rf " + resultPath)
         os.system("sudo mkdir " + resultPath)
         #
-        os.system("sudo rm -rf " + resultPathFDAMM)
-        os.system("sudo mkdir " + resultPathFDAMM)
+        cleanPath(resultPathFDAMM)
+        cleanPath(resultPathCoFD)
+        cleanPath(resultPathBetaCoFD)
+        cleanPath(resultPathRAWMM)
         #
-        os.system("sudo rm -rf " + resultPathRAWMM)
-        os.system("sudo mkdir " + resultPathRAWMM)
         runScanVector(exeSpace, valueVec, resultPathFDAMM, "config_FDAMM.csv")
+        runScanVector(exeSpace, valueVec, resultPathCoFD, "config_CoAMM.csv")
+        runScanVector(exeSpace, valueVec, resultPathBetaCoFD, "config_BCoAMM.csv")
         runScanVector(exeSpace, valueVec, resultPathRAWMM, "config_RAWMM.csv")
+    evaTypes=['FDAMM','MM','Co-FD','BCO-FD']
     elapseTimeVecFD, cacheMissVecFD, cacheRefVecFD = readResultVector(valueVec, resultPathFDAMM)
+    elapseTimeVecCoFD, cacheMissVecCoFD, cacheRefVecCoFD = readResultVector(valueVec, resultPathCoFD)
+    elapseTimeVeCB, cacheMissVecB, cacheRefVecB = readResultVector(valueVec, resultPathBetaCoFD)
     elapseTimeVecRAW, cacheMissVecRAW, cacheRefVecRAW = readResultVector(valueVec, resultPathRAWMM)
     # os.system("mkdir " + figPath)
-    groupLine.DrawFigure([valueVec,valueVec], [elapseTimeVecFD,elapseTimeVecRAW],
-                                ['FDAMM','MM'],
+    groupLine.DrawFigure([valueVec,valueVec,valueVec,valueVec], [elapseTimeVecFD,elapseTimeVecRAW,elapseTimeVecCoFD,elapseTimeVeCB],
+                                evaTypes,
                                 "#elements in A's row", "elapsed time (ms)", 0, 1, figPath + scanTag + "_elapsedTime",
                                 True)
-    groupLine.DrawFigureYnormal([valueVec,valueVec], [cacheMissVecFD/cacheRefVecFD*100.0,cacheMissVecRAW/cacheRefVecRAW*100.0],
-                                ['FDAMM','MM'],
+    groupLine.DrawFigureYnormal([valueVec,valueVec,valueVec,valueVec], [cacheMissVecFD/cacheRefVecFD*100.0,cacheMissVecRAW/cacheRefVecRAW*100.0,
+                                                                        cacheMissVecCoFD/cacheRefVecCoFD*100.0,cacheMissVecB/cacheRefVecB*100.0],
+                                evaTypes,
                                 "#elements in A's row", "cacheMiss (%)", 0, 1, figPath + scanTag + "_cacheMiss",
                                 True)
     # draw2yLine("watermark time (ms)",singleValueVecDisp,lat95Vec,errVec,"95% Latency (ms)","Error","ms","",figPath+"wm_lat")

benchmark/torchscripts/BetaCoOccurringFD.py

@@ -19,7 +19,7 @@ def attenuate(beta: float, k: torch.Tensor, l: int) -> torch.Tensor:
 @torch.jit.script
 def FDAMM(A: torch.Tensor, B: torch.Tensor, l: int):
 	B = B.t()
-	beta=28.0
+	beta=1.0
 	assert A.shape[1] == B.shape[1]
 	mx, n = A.shape
 	my, n = B.shape

commit_info

@@ -1,2 +1,2 @@
-1. add scripts
-2. fix the random seed bug, the seed is currently fixed into 114514
+1. modify scripts
+