Commit a77529d7 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/slurm-dependency' into 'main' 

New release solving integration with slurm (0.3.3)

This MR adds /opt/slurm as it is found in an external Cluster. The normal paths doesn't work so we need to specify it manually.

See merge request !121
parents 65fa6bdb ecbe983c

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cmake_minimum_required(VERSION 3.19) 


project(

  scord

  VERSION 0.3.1

  VERSION 0.3.3

  LANGUAGES C CXX

)

cmake/FindSlurm.cmake

+8 −13
Original line number Diff line number Diff line
@@ -68,32 +68,27 @@ The following cache variables may also be set: 
  The path to the Slurm library.



#]=======================================================================]

find_package(PkgConfig)

pkg_check_modules(PC_SLURM QUIET SLURM)



find_path(

  SLURM_INCLUDE_DIR

  NAMES slurm/slurm.h

  PATHS

    ENV SLURM

    ENV SLURM_PATH

    ENV SLURM_ROOT

    ENV CPATH

    ENV C_INCLUDE_PATH

    ENV CPLUS_INCLUDE_PATH

    "/opt/slurm"

  PATH_SUFFIXES include

)



find_library(SLURM_LIBRARY NAMES slurm



PATHS  

    ENV SLURM

    ENV SLURM_PATH

    ENV SLURM_ROOT 

    ENV LD_LIBRARY_PATH

    ENV LIBRARY_PATH

    ENV PATH

    "/opt/slurm"

  PATH_SUFFIXES

    "lib"

    "lib64"



)



mark_as_advanced(SLURM_INCLUDE_DIR SLURM_LIBRARY)

spack/packages/scord/package.py

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ class Scord(CMakePackage): 
    depends_on("cargo@0.3.2:", when='@0.3.1:')

    depends_on("slurm", when='@0.3.1:')



# slurm:

#   externals:

#    - spec: "slurm@23.02.6"

#      prefix: "opt/slurm-23.02.6/"



    with when("@0.2.0: +ofi"):

        depends_on("libfabric@1.14.0 fabrics=sockets,tcp,rxm")