Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Iker Martín Álvarez
Proteo
Commits
00fd51f0
Commit
00fd51f0
authored
Apr 09, 2024
by
iker_martin
Browse files
Minor changes in scripts
parent
e472a657
Changes
2
Hide whitespace changes
Inline
Side-by-side
Codes/Makefile
View file @
00fd51f0
...
@@ -14,7 +14,7 @@ endif
...
@@ -14,7 +14,7 @@ endif
DEF
=
-DUSE_MAL_SLURM
=
$(USE_MAL_SLURM)
-DUSE_MAL_BARRIERS
=
$(USE_MAL_BARRIERS)
-DUSE_MAL_DEBUG
=
$(USE_MAL_DEBUG)
DEF
=
-DUSE_MAL_SLURM
=
$(USE_MAL_SLURM)
-DUSE_MAL_BARRIERS
=
$(USE_MAL_BARRIERS)
-DUSE_MAL_DEBUG
=
$(USE_MAL_DEBUG)
.PHONY
:
clean clear install
install_slurm
.PHONY
:
clean clear install
# Final binary
# Final binary
BIN
=
a.out
BIN
=
a.out
...
@@ -33,13 +33,13 @@ OBJ = $(C_FILES:%.c=$(BUILD_DIR)/%.o)
...
@@ -33,13 +33,13 @@ OBJ = $(C_FILES:%.c=$(BUILD_DIR)/%.o)
# Gcc will create these .d files containing dependencies.
# Gcc will create these .d files containing dependencies.
DEP
=
$(OBJ:%.o=%.d)
DEP
=
$(OBJ:%.o=%.d)
# Default configuration file
$(CONFIG)
:
$(BUILD_DIR)/$(CONFIG)
# Default target named after the binary.
# Default target named after the binary.
$(BIN)
:
$(BUILD_DIR)/$(BIN)
$(BIN)
:
$(BUILD_DIR)/$(BIN)
# Default configuration file
$(CONFIG)
:
$(BUILD_DIR)/$(CONFIG)
$(BUILD_DIR)/$(CONFIG)
:
$(BUILD_DIR)/$(CONFIG)
:
mkdir
-p
$
(
@D
)
@
mkdir
-p
$
(
@D
)
@
echo
-n
"dir=
\"
"
>
$(BUILD_DIR)
/
$(CONFIG)
@
echo
-n
"dir=
\"
"
>
$(BUILD_DIR)
/
$(CONFIG)
@
realpath
-z
$$
(
echo
"
$
$(pwd)
/.."
)
|
tr
-d
'\0'
>>
$(BUILD_DIR)
/
$(CONFIG)
@
realpath
-z
$$
(
echo
"
$
$(pwd)
/.."
)
|
tr
-d
'\0'
>>
$(BUILD_DIR)
/
$(CONFIG)
@
echo
"
\"
"
>>
$(BUILD_DIR)
/
$(CONFIG)
@
echo
"
\"
"
>>
$(BUILD_DIR)
/
$(CONFIG)
...
@@ -58,14 +58,16 @@ $(BUILD_DIR)/$(BIN) : $(OBJ)
...
@@ -58,14 +58,16 @@ $(BUILD_DIR)/$(BIN) : $(OBJ)
# The -MMD flags additionaly creates a .d file with
# The -MMD flags additionaly creates a .d file with
# the same name as the .o file.
# the same name as the .o file.
$(BUILD_DIR)/%.o
:
%.c
$(BUILD_DIR)/%.o
:
%.c
mkdir
-p
$
(
@D
)
@
mkdir
-p
$
(
@D
)
$(MCC)
$(C_FLAGS)
$(DEF)
-MMD
-c
$<
-o
$@
$(MCC)
$(C_FLAGS)
$(DEF)
-MMD
-c
$<
-o
$@
clean
:
clean
:
-
rm
$(BUILD_DIR)
/
$(BIN)
$(BUILD_DIR)
/
$(CONFIG)
$(OBJ)
$(DEP)
-
rm
$(BUILD_DIR)
/
$(BIN)
$(BUILD_DIR)
/
$(CONFIG)
$(OBJ)
$(DEP)
clear
:
clear
:
-
rm
-rf
$(BUILDDIR)
-
rm
-rf
$(BUILD
_
DIR)
all
:
install
install
:
$(BIN) $(CONFIG)
install
:
$(BIN) $(CONFIG)
echo
"Done"
echo
"Done"
Codes/runBase.sh
View file @
00fd51f0
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
#SBATCH -p P1
#SBATCH -p P1
#SBATCH -N 1
#SBATCH -N 1
#SBATCH --exclude=n00
partition
=
'P1'
partition
=
'P1'
...
@@ -22,7 +21,6 @@ then
...
@@ -22,7 +21,6 @@ then
fi
fi
echo
"MPICH"
echo
"MPICH"
#export HYDRA_DEBUG=1
mpirun
--version
mpirun
--version
numP
=
$(
bash
$dir$execDir
/BashScripts/getNumPNeeded.sh
$configFile
0
)
numP
=
$(
bash
$dir$execDir
/BashScripts/getNumPNeeded.sh
$configFile
0
)
initial_nodelist
=
$(
bash
$dir$execDir
/BashScripts/createInitialNodelist.sh
$numP
$cores
$nodelist
)
initial_nodelist
=
$(
bash
$dir$execDir
/BashScripts/createInitialNodelist.sh
$numP
$cores
$nodelist
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment