Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
2e41b249
Commit
2e41b249
authored
13 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
add new flag to make srun on a bgl/p emulated system
parent
e8e40c7f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
auxdir/x_ac_bluegene.m4
+6
-2
6 additions, 2 deletions
auxdir/x_ac_bluegene.m4
configure.ac
+5
-0
5 additions, 0 deletions
configure.ac
src/Makefile.am
+1
-1
1 addition, 1 deletion
src/Makefile.am
with
12 additions
and
3 deletions
auxdir/x_ac_bluegene.m4
+
6
−
2
View file @
2e41b249
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
AC_DEFUN([X_AC_BGL],
AC_DEFUN([X_AC_BGL],
[
[
ac_real_bluegene_loaded=no
ac_bluegene_loaded=no
ac_bluegene_loaded=no
AC_ARG_WITH(db2-dir, AS_HELP_STRING(--with-db2-dir=PATH,Specify path to parent directory of DB2 library), [ trydb2dir=$withval ])
AC_ARG_WITH(db2-dir, AS_HELP_STRING(--with-db2-dir=PATH,Specify path to parent directory of DB2 library), [ trydb2dir=$withval ])
...
@@ -109,6 +110,7 @@ AC_DEFUN([X_AC_BGL],
...
@@ -109,6 +110,7 @@ AC_DEFUN([X_AC_BGL],
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
ac_bluegene_loaded=yes
ac_real_bluegene_loaded=yes
fi
fi
AC_SUBST(BG_INCLUDES)
AC_SUBST(BG_INCLUDES)
...
@@ -193,7 +195,8 @@ AC_DEFUN([X_AC_BGP],
...
@@ -193,7 +195,8 @@ AC_DEFUN([X_AC_BGP],
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
ac_bluegene_loaded=yes
fi
ac_real_bluegene_loaded=yes
fi
AC_SUBST(BG_INCLUDES)
AC_SUBST(BG_INCLUDES)
])
])
...
@@ -297,8 +300,9 @@ AC_DEFUN([X_AC_BGQ],
...
@@ -297,8 +300,9 @@ AC_DEFUN([X_AC_BGQ],
# AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
# AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
ac_bluegene_loaded=yes
ac_real_bluegene_loaded=yes
ac_bgq_loaded=yes
ac_bgq_loaded=yes
fi
fi
AC_SUBST(BG_INCLUDES)
AC_SUBST(BG_INCLUDES)
AC_SUBST(BG_LDFLAGS)
AC_SUBST(BG_LDFLAGS)
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
5
−
0
View file @
2e41b249
...
@@ -39,6 +39,11 @@ dnl so handle it later.
...
@@ -39,6 +39,11 @@ dnl so handle it later.
AM_CONDITIONAL(BG_L_P_LOADED, test "x$ac_bluegene_loaded" = "xyes")
AM_CONDITIONAL(BG_L_P_LOADED, test "x$ac_bluegene_loaded" = "xyes")
AC_SUBST(BG_L_P_LOADED)
AC_SUBST(BG_L_P_LOADED)
dnl ok now check if We are on a real L or P system, (test if to build srun
dnl or not. If we are emulating things we should build it.
AM_CONDITIONAL(REAL_BG_L_P_LOADED, test "x$ac_real_bluegene_loaded" = "xyes")
AC_SUBST(REAL_BG_L_P_LOADED)
X_AC_BGQ
X_AC_BGQ
dnl We need to know if this is a Q system
dnl We need to know if this is a Q system
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
1
−
1
View file @
2e41b249
...
@@ -5,7 +5,7 @@ SUBDIRS = common api db_api database \
...
@@ -5,7 +5,7 @@ SUBDIRS = common api db_api database \
sshare sprio
sshare sprio
if
!BUILD_SRUN2APRUN
if
!BUILD_SRUN2APRUN
if
!BG_L_P_LOADED
if
!
REAL_
BG_L_P_LOADED
SUBDIRS
+=
srun
SUBDIRS
+=
srun
endif
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment