Verified Commit 110a81fe authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Add PMDK build dependency

parent f6afe8e6

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ variables: 
  PYTEST:                       "${CI_PROJECT_DIR}/gkfs/install/share/gkfs/tests/integration/pytest-venv/bin/py.test"

  LOG_PATH:                     "${CI_PROJECT_DIR}/logs"

  LD_LIBRARY_PATH:              "${CI_PROJECT_DIR}/deps/install/lib:${CI_PROJECT_DIR}/deps/install/lib64"

  PKG_CONFIG_PATH:              "${CI_PROJECT_DIR}/deps/install/lib/pkgconfig:${CI_PROJECT_DIR}/deps/install/lib64/pkgconfig"

  # Configuration variables

  GKFS_LOG_LEVEL:               "100"

  GKFS_DAEMON_LOG_PATH:         "${CI_PROJECT_DIR}/logs/daemon.log"
@@ -25,7 +26,7 @@ variables: 
  LIBGKFS_LOG_OUTPUT:           "${CI_PROJECT_DIR}/logs/gkfs_client.log"

  GIT_SUBMODULE_STRATEGY:       recursive



image: gekkofs/gekkofs:build_env-0.8.0

image: gekkofs/build_env:0.8.0



check format:

  stage: check format

CMake/FindPMDK.cmake

0 → 100644
+1055 −0

File added.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ find_package(Syscall_intercept REQUIRED) 
# boost dependencies

find_package(Boost 1.53 REQUIRED

    COMPONENTS

    system

    program_options

    )
@@ -143,6 +144,10 @@ find_package(Filesystem REQUIRED) 


find_package(Date REQUIRED)



find_package(PMDK 1.9.1 REQUIRED

  COMPONENTS

    pmem)



option(CREATE_CHECK_PARENTS "Check parent directory existance before creating child node" ON)

message(STATUS "[gekkofs] Create checks parents: ${CREATE_CHECK_PARENTS}")

docker/debian_build_env.docker

+5 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ RUN apt-get update && \ 
		zlib1g-dev \

		# syscall_intercept dependencies

		libcapstone-dev \

        # pmdk dependencies

        libndctl-dev \

        libdaxctl-dev \

        pandoc \

		# GekkoFS

		libboost-filesystem-dev \

		libboost-program-options-dev \
@@ -48,7 +52,7 @@ RUN apt-get update && \ 
		lsb-release \

		wget \

		software-properties-common \

		gnupg2 \

		gnupg2 && \

    # add clang-10 repos

    wget https://apt.llvm.org/llvm.sh -P /tmp && chmod +x /tmp/llvm.sh && /tmp/llvm.sh 10 && \

    # install clang-format

scripts/compile_dep.sh

+15 −6
Original line number Diff line number Diff line
@@ -40,30 +40,30 @@ VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all ci" 


MOGON1_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"

    "syscall_intercept" "date" "verbs"

    "syscall_intercept" "date" "verbs" "pmdk"

)



MOGON2_DEPS=(

    "bzip2" "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"

    "syscall_intercept" "date" "psm2"

    "syscall_intercept" "date" "psm2" "pmdk"

)



NGIO_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"

    "syscall_intercept" "date" "agios" "psm2"

    "syscall_intercept" "date" "agios" "psm2" "pmdk"

)



DIRECT_DEPS=(

  "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date"

  "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "pmdk"

)



ALL_DEPS=(

    "bzip2" "zstd" "lz4" "snappy" "capstone" "bmi" "ofi" "mercury" "argobots" "margo" "rocksdb"

     "syscall_intercept" "date" "agios"

     "syscall_intercept" "date" "agios" "pmdk"

)



CI_DEPS=(

    "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "agios"

    "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "agios" "pmdk"

)



usage_short() {
@@ -514,4 +514,13 @@ if check_dependency "date" "${DEP_CONFIG[@]}"; then 
    make install

fi



# PMDK

if check_dependency "pmdk" "${DEP_CONFIG[@]}"; then

    echo "############################################################ Installing:  PMDK"

    CURR=${SOURCE}/pmdk

    cd "${CURR}"

    make -j"${CORES}"

    make install prefix="${INSTALL}"

fi



echo "Done"