v-0.0.2

ecrc · Nov 27, 2022 · cbd231e · cbd231e
1 parent 3f5cc55
commit cbd231e
Show file tree

Hide file tree

Showing 117 changed files with 3,249 additions and 287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ cudacomplex
 cudasingle
 amdcpucomplex
 amdcpusingle
+*build/
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 set(PROJECT_NAME TLRMVM)
 
@@ -35,7 +35,7 @@ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 option(BUILD_CPU "Build TLR-MVM using cpp" ON)
 option(BUILD_DPCPP "Build TLR-MVM on intel archs and use intel dpc++." OFF)
 option(BUILD_CUDA "Build TLR-MVM on NVIDIA gpu and cuda." OFF) # using NVIDIA GPU
-# option(BUILD_HIP "Build TLR-MVM on amd gpu and use hip." OFF) # using AMD GPU (AMD is under dev)
+ option(BUILD_HIP "Build TLR-MVM on amd gpu and use hip." OFF) # using AMD GPU (AMD is under dev)
 
 #########################
 # BLAS backend selection
@@ -190,18 +190,16 @@ endif() # BUILD_CUDA
 # HIP library
 #######################
 if(BUILD_HIP)
-    list(APPEND CMAKE_PREFIX_PATH $ENV{HIP_PATH} $ENV{ROCM_PATH}
-            $ENV{HIP_PATH}/hip $ENV{HIP_PATH}/llvm/lib/clang/14.0.0/lib/linux)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result ")
+    enable_language(HIP)
+    find_package(HIP REQUIRED)
     include(cmake/hiptlrmvm.cmake)
     add_library(tlrmvmhiplib SHARED ${CPU_HEADERS} ${CPU_SRCS} ${HIP_HEADERS} ${HIP_SRCS})
-    find_package(hip REQUIRED)
-    find_package(hipblas REQUIRED)
-    set(TLRMVM_LIBS ${TLRMVM_LIBS} hip::device roc::hipblas)
+#    find_package(hipblas REQUIRED)
+    set(TLRMVM_LIBS ${TLRMVM_LIBS} hip::device hip::host hipblas)
     target_include_directories(tlrmvmhiplib PUBLIC ${TLRMVM_INCS})
     target_link_libraries(tlrmvmhiplib PUBLIC ${TLRMVM_LIBS})
     AddCompileDefinitions(tlrmvmhiplib)
-    target_compile_definitions(tlrmvmhiplib PUBLIC -D__HIP_PLATFORM_HCC__=1) # for clion search ...
+#    target_compile_definitions(tlrmvmhiplib PUBLIC -D__HIP_PLATFORM_HCC__=1) # for clion search ...
     target_compile_definitions(tlrmvmhiplib PUBLIC USE_HIP)
     install(TARGETS tlrmvmhiplib DESTINATION lib)
 endif() # BUILD_HIP
@@ -212,7 +210,7 @@ endif() # BUILD_HIP
 #################
 if(BUILD_PYTHON AND (BUILD_CUDA OR BUILD_HIP))
     # now python is only available for CUDA and HIP build.
-    add_subdirectory(thirdparty/pybind11)
+    find_package(pybind11 REQUIRED)
     add_subdirectory(pytlrmvm)
 endif()
 

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2022, King Abdullah University of Science and Technology
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -105,7 +105,10 @@ Compile and install
 ## 4. Test
 You also need to download the dataset to run the experiments.
 dataset download url:
-https://drive.google.com/drive/folders/1_DSyloFjlScXGTlA1_ybJnTne59tUpgR?usp=sharing
+1. seismic redatuming dataset
+https://zenodo.org/record/6582600
+2. MAVIS AO system matrcies dataset
+https://zenodo.org/record/7305622
 
 after download, put it in a seperate folder and set `WORK_ROOT` to that folder.
 

diff --git a/benchmark/cpp/bench_mvm_fp32.cpp b/benchmark/cpp/bench_mvm_fp32.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <stdlib.h>
 #include <math.h>
 #include <memory.h>

diff --git a/benchmark/cpp/bench_mvm_singlecomplex.cpp b/benchmark/cpp/bench_mvm_singlecomplex.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <stdlib.h>
 #include <math.h>
 #include <memory.h>

diff --git a/benchmark/cuda/bench_mvm_cuda_fp32.cpp b/benchmark/cuda/bench_mvm_cuda_fp32.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <stdlib.h>
 #include <math.h>
 #include <memory.h>

diff --git a/benchmark/cuda/bench_mvm_cuda_singlecomplex.cpp b/benchmark/cuda/bench_mvm_cuda_singlecomplex.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <stdlib.h>
 #include <math.h>
 #include <memory.h>

diff --git a/benchmark/hip/Bench_hip_constrank.cpp b/benchmark/hip/Bench_hip_constrank.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <iostream>
 #include <unistd.h>
 #include <memory.h>

diff --git a/benchmark/hip/Bench_hip_tlrmvm.sh b/benchmark/hip/Bench_hip_tlrmvm.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+#
+#  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                      All rights reserved.
+#
+
 ./install/test/Bench_hip_constrank --M=9801 --N=9801 --threshold=0.001 \
 --datafolder=$WORK_ROOT/compresseddata --nb=256 \
 --problem=Mode4_Ordernormal_Mck_freqslice_100 --streams=10 --loopsize=200
diff --git a/cmake/hiptlrmvm.cmake b/cmake/hiptlrmvm.cmake
@@ -0,0 +1,21 @@
+include(${PROJECT_SOURCE_DIR}/cmake/tlrmvm.cmake)
+set(HIP_SRCS)
+set(HIP_HEADERS)
+
+# Common
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/common/hip/*.cpp)
+list(APPEND HIP_SRCS ${TMP})
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/common/hip/*.cu)
+list(APPEND HIP_SRCS ${TMP})
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/common/hip/*.hpp)
+list(APPEND HIP_HEADERS ${TMP})
+
+# tlrmvm
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/tlrmvm/hip/*.cpp)
+list(APPEND HIP_SRCS ${TMP})
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/tlrmvm/hip/*.cu)
+list(APPEND HIP_SRCS ${TMP})
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/tlrmvm/hip/*.hpp)
+list(APPEND HIP_HEADERS ${TMP})
+file(GLOB TMP ${PROJECT_SOURCE_DIR}/src/tlrmvm/hip/*.cuh)
+list(APPEND HIP_HEADERS ${TMP})
diff --git a/install/install-x86-cuda.sh b/install/install-x86-cuda.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/bash
+#
+#  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                      All rights reserved.
+#
+
 cmake -DCMAKE_CUDA_COMPILER:PATH=$(which nvcc) -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_C_COMPILER=$(which gcc) -DCMAKE_CXX_COMPILER=$(which g++) \
 -DUSE_MPI=ON -DUSE_MKL=ON -DBUILD_CUDA=ON -DBUILD_TEST=ON -DBUILD_PYTHON=ON -DPYTHON_EXECUTABLE=$(which python) 
 #-DPython_ROOT_DIR=/home/hongy0a/miniconda3/envs/a100env
diff --git a/install/install-x86.sh b/install/install-x86.sh
@@ -0,0 +1,5 @@
+#
+#  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                      All rights reserved.
+#
+
diff --git a/install/spack-install-x86-cuda.sh b/install/spack-install-x86-cuda.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/bash
+#
+#  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                      All rights reserved.
+#
+
 git clone -c feature.manyFiles=true https://github.com/spack/spack.git
 . $HOME/spack/share/spack/setup-env.sh
 spack compiler find

diff --git a/install/spack-install-x86.sh b/install/spack-install-x86.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/bash
+#
+#  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                      All rights reserved.
+#
+
 git clone -c feature.manyFiles=true https://github.com/spack/spack.git
 . $HOME/spack/share/spack/setup-env.sh
 spack compiler find

diff --git a/pytlrmvm/Densemat.py b/pytlrmvm/Densemat.py
@@ -1,3 +1,6 @@
+#   @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                       All rights reserved.
+
 from os.path import join
 from scipy.io import loadmat
 import numpy as np

diff --git a/pytlrmvm/__init__.py b/pytlrmvm/__init__.py
@@ -13,6 +13,9 @@ def __bootstrap__():
     spec.loader.exec_module(mod)
 __bootstrap__()
 
+#   @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                       All rights reserved.
+
 from ._wrapper import *
 # from .tlrmvmtools import *
 # from .tlrmat import *

diff --git a/pytlrmvm/_wrapper.py b/pytlrmvm/_wrapper.py
@@ -1,3 +1,6 @@
+#   @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                       All rights reserved.
+
 import TLRMVMpy as _cppimpl
 import numpy as _np
 from time import time as _time

diff --git a/pytlrmvm/convertmat2npy.py b/pytlrmvm/convertmat2npy.py
diff --git a/pytlrmvm/generateseismicinput.py b/pytlrmvm/generateseismicinput.py
diff --git a/pytlrmvm/src/BatchTlrmvm.cpp b/pytlrmvm/src/BatchTlrmvm.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 //
 // Created by Yuxi Hong on 12/03/2022.
 //

diff --git a/pytlrmvm/src/CommonWrapper.cpp b/pytlrmvm/src/CommonWrapper.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 //
 // Created by Yuxi Hong on 11/03/2022.
 //

diff --git a/pytlrmvm/src/Tlrmvm.cpp b/pytlrmvm/src/Tlrmvm.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 //
 // Created by Yuxi Hong on 12/03/2022.
 //

diff --git a/pytlrmvm/src/Wrapper.cpp b/pytlrmvm/src/Wrapper.cpp
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 #include <pybind11/pybind11.h>
 #include <pybind11/operators.h>
 #include <pybind11/numpy.h>
@@ -157,7 +160,6 @@ PYBIND11_MODULE(TLRMVMpy, m) {
     m.def("BatchUpdatexgpu_INT8_cf", &BatchUpdatex_INT8);
     m.def("BatchUpdateygpu_INT8_cf", &BatchUpdatey_INT8);
 
-    addbatchtlrmvmgpufp16int8(m);
 
     m.def("SetMaskmat", &SetMaskmat);
 }
diff --git a/pytlrmvm/src/wrapperdef.h b/pytlrmvm/src/wrapperdef.h
@@ -1,3 +1,6 @@
+//  @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+//                      All rights reserved.
+
 //
 // Created by Yuxi Hong on 12/03/2022.
 //

diff --git a/pytlrmvm/tlrmat.py b/pytlrmvm/tlrmat.py
@@ -1,3 +1,6 @@
+#   @Copyright (c) 2022 King Abdullah University of Science and Technology (KAUST).
+#                       All rights reserved.
+
 import time
 import pickle 
 import os