Admin/mira.py
author wenzelm
Tue, 31 Mar 2015 22:31:05 +0200
changeset 59886 e0dc738eb08c
parent 57559 841f41710066
child 59993 8f6cacc87f42
permissions -rw-r--r--
support for explicit scope of private entries;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     1
"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     2
    Test configuration descriptions for mira.
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     3
"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     4
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     5
import os
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     6
from os import path
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     7
from glob import glob
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
     8
import subprocess
42392
0045b85101c9 tool for importing nightly isatest logs
krauss
parents: 42197
diff changeset
     9
from datetime import datetime
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    10
import re
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    11
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    12
import util
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    13
42823
8a3b9dbc7406 mira hack for special settings on lxbroy10
krauss
parents: 42822
diff changeset
    14
from mira import schedule, misc
42192
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
    15
from mira.environment import scheduler
46931
d2b92739038b rudimentary distribution build configuration
haftmann
parents: 46200
diff changeset
    16
from mira import repositories
42192
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
    17
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    18
# build and evaluation tools
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    19
50599
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    20
DEFAULT_TIMEOUT = 2 * 60 * 60
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    21
SMLNJ_TIMEOUT = 72 * 60 * 60
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    22
50598
b4d62535f5cd removed unused usedir_options
krauss
parents: 50597
diff changeset
    23
def prepare_isabelle_repository(loc_isabelle, loc_dependency_heaps, more_settings=''):
42821
4629cbaebc04 clarified handling of ISABELLE_USEDIR_OPTIONS in mira
krauss
parents: 42472
diff changeset
    24
4629cbaebc04 clarified handling of ISABELLE_USEDIR_OPTIONS in mira
krauss
parents: 42472
diff changeset
    25
    # patch settings
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    26
    extra_settings = '''
42109
f5950b976076 enable Z3 in the test configuration
krauss
parents: 42095
diff changeset
    27
Z3_NON_COMMERCIAL="yes"
48785
1e384f729045 restored ISABELLE_OUTPUT etc -- still relevant at least for mira.py itself
krauss
parents: 48783
diff changeset
    28
50596
e526ac54316d plain init_components calls instead of symlinks
krauss
parents: 50595
diff changeset
    29
init_components "/home/isabelle/contrib" "$ISABELLE_HOME/Admin/components/main"
e526ac54316d plain init_components calls instead of symlinks
krauss
parents: 50595
diff changeset
    30
init_components "/home/isabelle/contrib" "$ISABELLE_HOME/Admin/components/optional"
e526ac54316d plain init_components calls instead of symlinks
krauss
parents: 50595
diff changeset
    31
init_components "/home/isabelle/contrib" "$ISABELLE_HOME/Admin/components/nonfree"
48182
221a17a97fab prefer hook in Admin/ to initialize components
haftmann
parents: 48181
diff changeset
    32
48783
de617c904131 fixed mira.py (cf. fd50596bf78b)
krauss
parents: 48778
diff changeset
    33
''' + more_settings
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    34
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    35
    writer = open(path.join(loc_isabelle, 'etc', 'settings'), 'a')
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    36
    writer.write(extra_settings)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    37
    writer.close()
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    38
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    39
45164
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    40
def isabelle_getenv(isabelle_home, var):
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    41
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    42
    _, out = env.run_process('%s/bin/isabelle' % isabelle_home, 'getenv', var)
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    43
    return out.split('=', 1)[1].strip()
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    44
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    45
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    46
def extract_isabelle_run_timing(logdata):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    47
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    48
    def to_secs(h, m, s):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    49
        return (int(h) * 60 + int(m)) * 60 + int(s)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    50
    pat = r'Finished (\S+) \((\d+):(\d+):(\d+) elapsed time, (\d+):(\d+):(\d+) cpu time'
42186
bb688200b949 adapted parsing of session timing (cf. e86b10c68f0b)
krauss
parents: 42140
diff changeset
    51
    pat2 = r'Timing (\S+) \((\d+) threads, (\d+\.\d+)s elapsed time, (\d+\.\d+)s cpu time, (\d+\.\d+)s GC time, factor (\d+\.\d+)\)'
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    52
    t = dict((name, {'elapsed': to_secs(eh,em,es), 'cpu': to_secs(ch,cm,cs)})
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    53
             for name, eh, em, es, ch, cm, cs in re.findall(pat, logdata))
42186
bb688200b949 adapted parsing of session timing (cf. e86b10c68f0b)
krauss
parents: 42140
diff changeset
    54
    for name, threads, elapsed, cpu, gc, factor in re.findall(pat2, logdata):
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    55
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    56
        if name not in t:
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    57
            t[name] = {}
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    58
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    59
        t[name]['threads'] = int(threads)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    60
        t[name]['elapsed_inner'] = elapsed
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    61
        t[name]['cpu_inner'] = cpu
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    62
        t[name]['gc'] = gc
42186
bb688200b949 adapted parsing of session timing (cf. e86b10c68f0b)
krauss
parents: 42140
diff changeset
    63
        t[name]['factor'] = factor
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    64
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    65
    return t
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    66
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    67
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    68
def extract_isabelle_run_summary(logdata):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    69
41894
7c4a4b02dbdb produce helpful mira summary for more errors
krauss
parents: 41652
diff changeset
    70
    re_error = re.compile(r'^(?:make: )?\*\*\* (.*)$', re.MULTILINE)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    71
    summary = '\n'.join(re_error.findall(logdata))
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    72
    if summary == '':
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    73
        summary = 'ok'
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    74
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    75
    return summary
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    76
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    77
45164
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    78
def extract_image_size(isabelle_home):
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    79
    
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    80
    isabelle_output = isabelle_getenv(isabelle_home, 'ISABELLE_OUTPUT')
50595
8bf60e7a6b6c tolerate non-existent ISABELLE_OUTPUT
krauss
parents: 50594
diff changeset
    81
    if not path.exists(isabelle_output):
8bf60e7a6b6c tolerate non-existent ISABELLE_OUTPUT
krauss
parents: 50594
diff changeset
    82
        return {}
8bf60e7a6b6c tolerate non-existent ISABELLE_OUTPUT
krauss
parents: 50594
diff changeset
    83
45164
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    84
    return dict((p, path.getsize(path.join(isabelle_output, p))) for p in os.listdir(isabelle_output) if p != "log")
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    85
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    86
def extract_report_data(isabelle_home, logdata):
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    87
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    88
    return {
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    89
        'timing': extract_isabelle_run_timing(logdata),
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    90
        'image_size': extract_image_size(isabelle_home) }
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    91
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
    92
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
    93
def isabelle_build(env, case, paths, dep_paths, playground, *cmdargs, **kwargs):
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    94
50599
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    95
    more_settings = kwargs.get('more_settings', '')
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    96
    keep_results = kwargs.get('keep_results', True)
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
    97
    timeout = kwargs.get('timeout', DEFAULT_TIMEOUT)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
    98
42114
1cdf54e845fa clarified
krauss
parents: 42113
diff changeset
    99
    isabelle_home = paths[0]
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   100
57179
011955e7846b mira: USER_HOME must exist for building JEdit documentation
noschinl
parents: 57172
diff changeset
   101
    home_user_dir = path.join(isabelle_home, 'home_user')
011955e7846b mira: USER_HOME must exist for building JEdit documentation
noschinl
parents: 57172
diff changeset
   102
    os.makedirs(home_user_dir)
011955e7846b mira: USER_HOME must exist for building JEdit documentation
noschinl
parents: 57172
diff changeset
   103
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   104
    # copy over build results from dependencies
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   105
    heap_dir = path.join(isabelle_home, 'heaps')
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   106
    classes_dir = path.join(heap_dir, 'classes')
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   107
    os.makedirs(classes_dir)
42115
e6a1dc0aa058 mira interface to 'isabelle make' in addition to usedir and makeall;
krauss
parents: 42114
diff changeset
   108
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   109
    for dep_path in dep_paths:
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   110
        subprocess.check_call(['cp', '-a'] + glob(dep_path + '/*') + [heap_dir])
45164
13dddf30c792 mira: collect size of heap images
krauss
parents: 45157
diff changeset
   111
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   112
    subprocess.check_call(['ln', '-s', classes_dir, path.join(isabelle_home, 'lib', 'classes')])
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   113
    jars = glob(path.join(classes_dir, 'ext', '*.jar'))
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   114
    if jars:
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   115
        subprocess.check_call(['touch'] + jars)
42115
e6a1dc0aa058 mira interface to 'isabelle make' in addition to usedir and makeall;
krauss
parents: 42114
diff changeset
   116
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   117
    # misc preparations
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   118
    if 'lxbroy10' in misc.hostnames():  # special settings for lxbroy10
42823
8a3b9dbc7406 mira hack for special settings on lxbroy10
krauss
parents: 42822
diff changeset
   119
        more_settings += '''
43334
9970a4580d13 adding ISABELLE_GHC environment setting to mira configuration isabelle makeall all on lxbroy10
bulwahn
parents: 43153
diff changeset
   120
ISABELLE_GHC="/usr/bin/ghc"
42823
8a3b9dbc7406 mira hack for special settings on lxbroy10
krauss
parents: 42822
diff changeset
   121
'''
8a3b9dbc7406 mira hack for special settings on lxbroy10
krauss
parents: 42822
diff changeset
   122
50598
b4d62535f5cd removed unused usedir_options
krauss
parents: 50597
diff changeset
   123
    prepare_isabelle_repository(isabelle_home, None, more_settings=more_settings)
42114
1cdf54e845fa clarified
krauss
parents: 42113
diff changeset
   124
    os.chdir(isabelle_home)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   125
50600
48c0c3bc40dd tuned "use build timeout": tuples cannot be concatenated
noschinl
parents: 50599
diff changeset
   126
    args = (['-o', 'timeout=%s' % timeout] if timeout is not None else []) + list(cmdargs)
50599
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
   127
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   128
    # invoke build tool
57559
841f41710066 mira.py: building jEdit plugin is required for makeall
noschinl
parents: 57179
diff changeset
   129
    (return_code, log1) = env.run_process('%s/bin/isabelle' % isabelle_home, 'jedit', '-bf',
57172
bcc6dc6c1d1c set USER_HOME to affect also ISABELLE_PATH et al
noschinl
parents: 53658
diff changeset
   130
            USER_HOME=home_user_dir)
57559
841f41710066 mira.py: building jEdit plugin is required for makeall
noschinl
parents: 57179
diff changeset
   131
    (return_code, log2) = env.run_process('%s/bin/isabelle' % isabelle_home, 'build', '-s', '-v', *args,
841f41710066 mira.py: building jEdit plugin is required for makeall
noschinl
parents: 57179
diff changeset
   132
            USER_HOME=home_user_dir)
841f41710066 mira.py: building jEdit plugin is required for makeall
noschinl
parents: 57179
diff changeset
   133
    log = log1 + log2
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   134
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   135
    # collect report
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   136
    return (return_code == 0, extract_isabelle_run_summary(log),
49175
eab51f249c70 option for discarding build results, enabled in particular for Isabelle_makeall
krauss
parents: 48848
diff changeset
   137
      extract_report_data(isabelle_home, log), {'log': log}, heap_dir if keep_results else None)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   138
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   139
43689
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   140
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   141
# Isabelle configurations
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   142
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   143
@configuration(repos = [Isabelle], deps = [])
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   144
def Pure(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   145
    """Pure Image"""
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   146
    return isabelle_build(*(args + ("-b", "Pure")))
43689
b8d79bd6029e 64bit versions of some mira configurations
krauss
parents: 43688
diff changeset
   147
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   148
@configuration(repos = [Isabelle], deps = [(Pure, [0])])
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   149
def HOL(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   150
    """HOL Image"""
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   151
    return isabelle_build(*(args + ("-b", "HOL")))
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   152
46934
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   153
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   154
def HOL_Library(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   155
    """HOL Library"""
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   156
    return isabelle_build(*(args + ("-b", "HOL-Library")))
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   157
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   158
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
48688
fe611991427a corrected session name
krauss
parents: 48687
diff changeset
   159
def HOLCF(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   160
    """HOLCF"""
48688
fe611991427a corrected session name
krauss
parents: 48687
diff changeset
   161
    return isabelle_build(*(args + ("-b", "HOLCF")))
46934
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   162
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   163
@configuration(repos = [Isabelle], deps = [(Pure, [0])])
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   164
def ZF(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   165
    """HOLCF"""
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   166
    return isabelle_build(*(args + ("-b", "ZF")))
46934
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   167
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   168
47895
68f5aaf7cdd2 playing around with mira settings
bulwahn
parents: 47744
diff changeset
   169
settings64='''
50593
8372c8b59cea mira: do not hard-code polyml version
krauss
parents: 49814
diff changeset
   170
# enforce 64 bit, overriding smart detection
8372c8b59cea mira: do not hard-code polyml version
krauss
parents: 49814
diff changeset
   171
ML_PLATFORM="$ISABELLE_PLATFORM64"
8372c8b59cea mira: do not hard-code polyml version
krauss
parents: 49814
diff changeset
   172
ML_HOME="$(dirname $ML_HOME)/$ML_PLATFORM"
47895
68f5aaf7cdd2 playing around with mira settings
bulwahn
parents: 47744
diff changeset
   173
'''
68f5aaf7cdd2 playing around with mira settings
bulwahn
parents: 47744
diff changeset
   174
47897
9d978604aee4 build Pure_64 with new settings
bulwahn
parents: 47896
diff changeset
   175
@configuration(repos = [Isabelle], deps = [])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   176
def Isabelle_makeall(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   177
    """Build all sessions"""
49175
eab51f249c70 option for discarding build results, enabled in particular for Isabelle_makeall
krauss
parents: 48848
diff changeset
   178
    return isabelle_build(*(args + ("-j", "6", "-o", "threads=4", "-a")), more_settings=settings64, keep_results=False)
46934
89cc3dfb383b rudimentary documentation test
haftmann
parents: 46931
diff changeset
   179
46931
d2b92739038b rudimentary distribution build configuration
haftmann
parents: 46200
diff changeset
   180
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   181
# Mutabelle configurations
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   182
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   183
def invoke_mutabelle(theory, env, case, paths, dep_paths, playground):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   184
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   185
    """Mutant testing for counterexample generators in Isabelle"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   186
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   187
    (loc_isabelle,) = paths
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   188
    (dep_isabelle,) = dep_paths
43152
6c4e021dec06 adding more settings to mira's mutabelle configuration
bulwahn
parents: 42948
diff changeset
   189
    more_settings = '''
43153
cbb748ccf81b changing the mira setting again for the mutabelle configuration
bulwahn
parents: 43152
diff changeset
   190
ISABELLE_GHC="/usr/bin/ghc"
43152
6c4e021dec06 adding more settings to mira's mutabelle configuration
bulwahn
parents: 42948
diff changeset
   191
'''
50598
b4d62535f5cd removed unused usedir_options
krauss
parents: 50597
diff changeset
   192
    prepare_isabelle_repository(loc_isabelle, dep_isabelle, more_settings = more_settings)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   193
    os.chdir(loc_isabelle)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   194
    
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   195
    (return_code, log) = env.run_process('bin/isabelle',
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   196
      'mutabelle', '-O', playground, theory)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   197
    
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   198
    try:
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   199
        mutabelle_log = util.readfile(path.join(playground, 'log'))
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   200
    except IOError:
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   201
        mutabelle_log = ''
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   202
42472
8a33a5596ba8 mutabelle reports: parse results out of log file
krauss
parents: 42393
diff changeset
   203
    mutabelle_data = dict(
8a33a5596ba8 mutabelle reports: parse results out of log file
krauss
parents: 42393
diff changeset
   204
        (tool, {'counterexample': c, 'no_counterexample': n, 'timeout': t, 'error': e})
8a33a5596ba8 mutabelle reports: parse results out of log file
krauss
parents: 42393
diff changeset
   205
        for tool, c, n, t, e in re.findall(r'(\S+)\s+: C: (\d+) N: (\d+) T: (\d+) E: (\d+)', log))
8a33a5596ba8 mutabelle reports: parse results out of log file
krauss
parents: 42393
diff changeset
   206
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   207
    return (return_code == 0 and mutabelle_log != '', extract_isabelle_run_summary(log),
42472
8a33a5596ba8 mutabelle reports: parse results out of log file
krauss
parents: 42393
diff changeset
   208
      {'mutabelle_results': {theory: mutabelle_data}},
41652
4f4336e730b9 report mutabelle log in mira configuration
haftmann
parents: 41554
diff changeset
   209
      {'log': log, 'mutabelle_log': mutabelle_log}, None)
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   210
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   211
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   212
def Mutabelle_Relation(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   213
    """Mutabelle regression suite on Relation theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   214
    return invoke_mutabelle('Relation', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   215
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   216
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   217
def Mutabelle_List(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   218
    """Mutabelle regression suite on List theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   219
    return invoke_mutabelle('List', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   220
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   221
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   222
def Mutabelle_Set(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   223
    """Mutabelle regression suite on Set theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   224
    return invoke_mutabelle('Set', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   225
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   226
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   227
def Mutabelle_Map(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   228
    """Mutabelle regression suite on Map theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   229
    return invoke_mutabelle('Map', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   230
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   231
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   232
def Mutabelle_Divides(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   233
    """Mutabelle regression suite on Divides theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   234
    return invoke_mutabelle('Divides', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   235
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   236
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   237
def Mutabelle_MacLaurin(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   238
    """Mutabelle regression suite on MacLaurin theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   239
    return invoke_mutabelle('MacLaurin', *args)
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   240
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   241
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
41542
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   242
def Mutabelle_Fun(*args):
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   243
    """Mutabelle regression suite on Fun theory"""
a5478b1c8b8a configuration file for mira
haftmann
parents:
diff changeset
   244
    return invoke_mutabelle('Fun', *args)
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   245
42393
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   246
mutabelle_confs = 'Mutabelle_Relation Mutabelle_List Mutabelle_Set Mutabelle_Map Mutabelle_Divides Mutabelle_MacLaurin Mutabelle_Fun'.split(' ')
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   247
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   248
@scheduler()
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   249
def mutabelle_scheduler(env):
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   250
    """Scheduler for Mutabelle."""
c9bf3f8a8930 scheduler for Mutabelle regression
krauss
parents: 42392
diff changeset
   251
    return schedule.age_scheduler(env, 'Isabelle', mutabelle_confs)
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   252
47896
bulwahn
parents: 47895
diff changeset
   253
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   254
# Judgement Day configurations
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   255
42095
a8598661d5eb added more judgement day provers
krauss
parents: 42058
diff changeset
   256
judgement_day_provers = ('e', 'spass', 'vampire', 'z3', 'cvc3', 'yices')
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   257
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   258
def judgement_day(base_path, theory, opts, env, case, paths, dep_paths, playground):
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   259
    """Judgement Day regression suite"""
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   260
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   261
    isa = paths[0]
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   262
    dep_path = dep_paths[0]
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   263
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   264
    os.chdir(path.join(playground, '..', base_path)) # Mirabelle requires specific cwd
50594
3f794789df0e removed obsolete parameter for contrib dir; hard-coding is not a problem
krauss
parents: 50593
diff changeset
   265
    prepare_isabelle_repository(isa, dep_path)
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   266
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   267
    output = {}
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   268
    success_rates = {}
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   269
    some_success = False
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   270
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   271
    for atp in judgement_day_provers:
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   272
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   273
        log_dir = path.join(playground, 'mirabelle_log_' + atp)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   274
        os.makedirs(log_dir)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   275
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   276
        cmd = ('%s/bin/isabelle mirabelle -q -O %s sledgehammer[prover=%s,%s] %s.thy'
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   277
               % (isa, log_dir, atp, opts, theory))
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   278
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   279
        os.system(cmd)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   280
        output[atp] = util.readfile(path.join(log_dir, theory + '.log'))
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   281
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   282
        percentages = list(re.findall(r'Success rate: (\d+)%', output[atp]))
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   283
        if len(percentages) == 2:
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   284
            success_rates[atp] = {
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   285
                'sledgehammer': int(percentages[0]),
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   286
                'metis': int(percentages[1])}
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   287
            if success_rates[atp]['sledgehammer'] > 0:
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   288
                some_success = True
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   289
        else:
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   290
            success_rates[atp] = {}
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   291
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   292
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   293
    data = {'success_rates': success_rates}
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   294
    raw_attachments = dict((atp + "_output", output[atp]) for atp in judgement_day_provers)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   295
    # FIXME: summary?
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   296
    return (some_success, '', data, raw_attachments, None)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   297
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   298
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   299
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   300
def JD_NS(*args):
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   301
    """Judgement Day regression suite NS"""
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   302
    return judgement_day('Isabelle/src/HOL/Auth', 'NS_Shared', 'prover_timeout=10', *args)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   303
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   304
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   305
def JD_FTA(*args):
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   306
    """Judgement Day regression suite FTA"""
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   307
    return judgement_day('Isabelle/src/HOL/Library', 'Fundamental_Theorem_Algebra', 'prover_timeout=10', *args)
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   308
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   309
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   310
def JD_Hoare(*args):
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   311
    """Judgement Day regression suite Hoare"""
42058
1eda69f0b9a8 moved some configurations to AFP, and fixed others
krauss
parents: 42040
diff changeset
   312
    return judgement_day('Isabelle/src/HOL/IMPP', 'Hoare', 'prover_timeout=10', *args)
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   313
42948
e6990acab6ff reverted 7fdd8d4908dc -- keeping images from Isabelle_makeall would be too expensive
krauss
parents: 42824
diff changeset
   314
@configuration(repos = [Isabelle], deps = [(HOL, [0])])
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   315
def JD_SN(*args):
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   316
    """Judgement Day regression suite SN"""
42058
1eda69f0b9a8 moved some configurations to AFP, and fixed others
krauss
parents: 42040
diff changeset
   317
    return judgement_day('Isabelle/src/HOL/Proofs/Lambda', 'StrongNorm', 'prover_timeout=10', *args)
42040
869df9b88deb added judgement day configurations
krauss
parents: 41894
diff changeset
   318
42116
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   319
42192
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   320
JD_confs = 'JD_NS JD_FTA JD_Hoare JD_SN JD_Arrow JD_FFT JD_Jinja JD_QE JD_S2S'.split(' ')
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   321
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   322
@scheduler()
42197
5f311600ba26 fixed accidental redefinition
krauss
parents: 42192
diff changeset
   323
def judgement_day_scheduler(env):
42192
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   324
    """Scheduler for Judgement Day."""
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   325
    return schedule.age_scheduler(env, 'Isabelle', JD_confs)
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   326
906780d5138e scheduler for judgement day
krauss
parents: 42186
diff changeset
   327
42116
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   328
# SML/NJ
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   329
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   330
smlnj_settings = '''
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   331
ML_SYSTEM=smlnj
53658
9e8714b4661a updated to smlnj 110.76;
wenzelm
parents: 50600
diff changeset
   332
ML_HOME="/home/smlnj/110.76/bin"
48443
6f2762eedca0 updated smlnj settings;
wenzelm
parents: 48190
diff changeset
   333
ML_OPTIONS="@SMLdebug=/dev/null @SMLalloc=1024"
42116
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   334
ML_PLATFORM=$(eval $("$ML_HOME/.arch-n-opsys" 2>/dev/null); echo "$HEAP_SUFFIX")
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   335
'''
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   336
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   337
@configuration(repos = [Isabelle], deps = [(Pure, [0])])
42116
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   338
def SML_HOL(*args):
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   339
    """HOL image built with SML/NJ"""
50599
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
   340
    return isabelle_build(*(args + ("-b", "HOL")), more_settings=smlnj_settings, timeout=SMLNJ_TIMEOUT)
42116
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   341
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   342
@configuration(repos = [Isabelle], deps = [])
b9ae421fbcc7 added configurations SML_HOL and SML_makeall (even though the latter is practically infeasible)
krauss
parents: 42115
diff changeset
   343
def SML_makeall(*args):
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   344
    """SML/NJ build of all possible sessions"""
50599
e129fcc720c1 use build timeout (wall clock time, default: 2h)
krauss
parents: 50598
diff changeset
   345
    return isabelle_build(*(args + ("-j", "3", "-a")), more_settings=smlnj_settings, timeout=SMLNJ_TIMEOUT)
48686
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   346
4cf09bc175d7 modernized mira configurations, making use of isabelle build
krauss
parents: 48685
diff changeset
   347