Commit dcf1f0c9 authored by Pierre Augier's avatar Pierre Augier

merge commit

......@@ -2,8 +2,8 @@
0.1.2
-----
- Better paramcontainer (ordered children + `_print_docs` method)
-
- Better paramcontainer (ordered children + `_print_docs` method).
- Better cluster oar (python 2/3).
0.1.1
-----
......
......@@ -47,15 +47,6 @@ class Calcul(ClusterOAR):
frontends = ['nrj1sv223', 'nrj1sv224']
job_count = 0
def __init__(self):
super(Calcul, self).__init__()
self.commands_setting_env = [
'source /etc/profile',
'module load python/2.7.9',
'source /home/users/$USER/opt/mypy2.7/bin/activate']
def stall(self, name_run='fluiddyn', stall_after=1, t_sleep=30):
"""Stall job submission to wait for similar jobs to complete.
......@@ -79,6 +70,7 @@ class Calcul(ClusterOAR):
tnow - tstart, 'seconds', end=' ')
time.sleep(t_sleep)
class Calcul7(Calcul):
name_cluster = 'calcul7'
has_to_add_name_cluster = True
......
......@@ -18,6 +18,7 @@ from builtins import object
import os
import datetime
import stat
from sys import version_info as version
from . import subprocess
from ..util.query import run_asking_agreement, call_bash
......@@ -31,8 +32,10 @@ class ClusterOAR(object):
def __init__(self):
self.commands_setting_env = [
'source /etc/profile',
'module load python/2.7.9',
'source /home/users/$USER/mypy2.7/bin/activate']
'module load python/{}.{}.{}'.format(
version.major, version.minor, version.micro),
'source /home/users/$USER/opt/mypy{}.{}/bin/activate'.format(
version.major, version.minor)]
self.useful_commands = (
'oarsub -S script.sh',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment