-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathframework_diff_cleaned.txt
1505 lines (1345 loc) · 70.6 KB
/
framework_diff_cleaned.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/home/uvacse/git/easybuild-framework/easybuild/framework/easyblock.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/framework/easyblock.py
index 3d09524..ce9b251 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/framework/easyblock.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/framework/easyblock.py
@@ -1916,9 +1916,11 @@ class EasyBlock(object):
self.toolchain.reset()
# prepare toolchain: load toolchain module and dependencies, set up build environment
+ self.log.debug("prepare toolchain...")
self.toolchain.prepare(self.cfg['onlytcmod'], deps=self.cfg.dependencies(), silent=self.silent,
rpath_filter_dirs=self.rpath_filter_dirs, rpath_include_dirs=self.rpath_include_dirs)
-
+ self.log.debug("prepare toolchain - Done.")
+
# keep track of environment variables that were tweaked and need to be restored after environment got reset
# $TMPDIR may be tweaked for OpenMPI 2.x, which doesn't like long $TMPDIR paths...
self.tweaked_env_vars = {}
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/clanggcc.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/clanggcc.py
index 91bcfe2..0cf519d 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/clanggcc.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/clanggcc.py
@@ -37,12 +37,12 @@ from easybuild.toolchains.compiler.gcc import Gcc
from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
-TC_CONSTANT_CLANGGCC = "ClangGCC"
+TC_CONSTANT_CLANGGCC = "clanggcc"
class ClangGcc(Clang, Gcc):
"""Compiler toolchain with Clang and GFortran compilers."""
- NAME = 'ClangGCC'
- COMPILER_MODULE_NAME = ['Clang', 'GCC']
+ NAME = 'clanggcc'
+ COMPILER_MODULE_NAME = ['clang', 'gcc']
COMPILER_FAMILY = TC_CONSTANT_CLANGGCC
SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/clang.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/clang.py
index a35b59e..0c7b99f 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/clang.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/clang.py
@@ -36,13 +36,13 @@ from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.toolchain.compiler import Compiler
-TC_CONSTANT_CLANG = "Clang"
+TC_CONSTANT_CLANG = "clang"
class Clang(Compiler):
"""Clang compiler class"""
- COMPILER_MODULE_NAME = ['Clang']
+ COMPILER_MODULE_NAME = ['clang']
COMPILER_FAMILY = TC_CONSTANT_CLANG
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/cuda.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/cuda.py
index 5f493c5..d42735c 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/cuda.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/cuda.py
@@ -35,13 +35,13 @@ from easybuild.tools.toolchain.compiler import Compiler
from easybuild.tools.toolchain.variables import FlagList
-TC_CONSTANT_CUDA = "CUDA"
+TC_CONSTANT_CUDA = "cuda"
class Cuda(Compiler):
"""CUDA compiler class."""
- COMPILER_CUDA_MODULE_NAME = ['CUDA']
+ COMPILER_CUDA_MODULE_NAME = ['cuda']
COMPILER_CUDA_FAMILY = TC_CONSTANT_CUDA
COMPILER_CUDA_UNIQUE_OPTS = {
@@ -76,7 +76,7 @@ class Cuda(Compiler):
def _set_compiler_vars(self):
"""Set the compiler variables"""
# append lib dir paths to LDFLAGS (only if the paths are actually there)
- root = self.get_software_root('CUDA')[0]
+ root = self.get_software_root('cuda')[0]
self.variables.append_subdirs("LDFLAGS", root, subdirs=["lib64", "lib"])
super(Cuda, self)._set_compiler_vars()
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/gcc.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/gcc.py
index ceaac6d..826735b 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/gcc.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/gcc.py
@@ -44,7 +44,7 @@ TC_CONSTANT_GCC = "GCC"
class Gcc(Compiler):
"""GCC compiler class"""
- COMPILER_MODULE_NAME = ['GCC']
+ COMPILER_MODULE_NAME = ['gcc']
COMPILER_FAMILY = TC_CONSTANT_GCC
COMPILER_UNIQUE_OPTS = {
@@ -114,11 +114,11 @@ class Gcc(Compiler):
# append lib dir paths to LDFLAGS (only if the paths are actually there)
# Note: hardcode 'GCC' here; we can not reuse COMPILER_MODULE_NAME because
# it can be redefined by combining GCC with other compilers (e.g., Clang).
- gcc_root = get_software_root('GCCcore')
+ gcc_root = get_software_root('gcccore')
if gcc_root is None:
- gcc_root = get_software_root('GCC')
+ gcc_root = get_software_root('gcc')
if gcc_root is None:
- raise EasyBuildError("Failed to determine software root for GCC")
+ raise EasyBuildError("Failed to determine software root for gcc")
self.variables.append_subdirs("LDFLAGS", gcc_root, subdirs=["lib64", "lib"])
@@ -130,9 +130,9 @@ class Gcc(Compiler):
(--optarch and --optarch=GENERIC still override this value)
"""
if default_optarch is None and self.arch == systemtools.AARCH64:
- gcc_version = get_software_version('GCCcore')
+ gcc_version = get_software_version('gcccore')
if gcc_version is None:
- gcc_version = get_software_version('GCC')
+ gcc_version = get_software_version('gcc')
if gcc_version is None:
raise EasyBuildError("Failed to determine software version for GCC")
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/inteliccifort.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/inteliccifort.py
index f6ab849..0e569d8 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/inteliccifort.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/inteliccifort.py
@@ -45,7 +45,7 @@ class IntelIccIfort(Compiler):
should be done anyway (all icc versions come with matching ifort version)
"""
- COMPILER_MODULE_NAME = ['icc', 'ifort']
+ COMPILER_MODULE_NAME = ['intel'] # ['icc', 'ifort']
COMPILER_FAMILY = TC_CONSTANT_INTELCOMP
COMPILER_UNIQUE_OPTS = {
@@ -108,19 +108,21 @@ class IntelIccIfort(Compiler):
"""Intel compilers-specific adjustments after setting compiler variables."""
super(IntelIccIfort, self)._set_compiler_vars()
- if not ('icc' in self.COMPILER_MODULE_NAME and 'ifort' in self.COMPILER_MODULE_NAME):
+ if not 'intel' in self.COMPILER_MODULE_NAME and not ('icc' in self.COMPILER_MODULE_NAME and 'ifort' in self.COMPILER_MODULE_NAME):
raise EasyBuildError("_set_compiler_vars: missing icc and/or ifort from COMPILER_MODULE_NAME %s",
self.COMPILER_MODULE_NAME)
- icc_root, _ = self.get_software_root(self.COMPILER_MODULE_NAME)[0:2]
- icc_version, ifort_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+ icc_root = self.get_software_root(self.COMPILER_MODULE_NAME)[0] # [0:2]
+ # icc_version, ifort_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+ icc_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0]
+ ifort_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0]
if not ifort_version == icc_version:
raise EasyBuildError("_set_compiler_vars: mismatch between icc version %s and ifort version %s",
icc_version, ifort_version)
- if LooseVersion(icc_version) < LooseVersion('2011'):
- self.LIB_MULTITHREAD.insert(1, "guide")
+ #if LooseVersion(icc_version) < LooseVersion('2011'):
+ # self.LIB_MULTITHREAD.insert(1, "guide")
libpaths = ['intel64']
if self.options.get('32bit', None):
@@ -134,7 +136,8 @@ class IntelIccIfort(Compiler):
def set_variables(self):
"""Set the variables."""
# -fopenmp is not supported in old versions (11.x)
- icc_version, _ = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+ #icc_version, _ = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+ icc_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0]
if LooseVersion(icc_version) < LooseVersion('12'):
self.options.options_map['openmp'] = 'openmp'
diff --git a/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/intelnompi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/intelnompi.py
new file mode 100644
index 0000000..b80ec7e
--- /dev/null
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/intelnompi.py
@@ -0,0 +1,141 @@
+##
+# Copyright 2012-2019 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/easybuilders/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+Support for Intel compilers (icc, ifort) as toolchain compilers.
+
+:author: Stijn De Weirdt (Ghent University)
+:author: Kenneth Hoste (Ghent University)
+"""
+
+from distutils.version import LooseVersion
+
+import easybuild.tools.systemtools as systemtools
+from easybuild.tools.build_log import EasyBuildError
+from easybuild.tools.toolchain.compiler import Compiler
+
+
+TC_CONSTANT_INTELCOMP = "Intel"
+
+
+class IntelNoMPI(Compiler):
+ """Intel compiler class
+ - TODO: install as single package ?
+ should be done anyway (all icc versions come with matching ifort version)
+ """
+
+ COMPILER_MODULE_NAME = ['intel']
+
+ COMPILER_FAMILY = TC_CONSTANT_INTELCOMP
+ COMPILER_UNIQUE_OPTS = {
+ 'intel-static': (False, "Link Intel provided libraries statically"),
+ 'no-icc': (False, "Don't set Intel specific macros"),
+ 'error-unknown-option': (False, "Error instead of warning for unknown options"),
+ }
+
+ COMPILER_UNIQUE_OPTION_MAP = {
+ 'i8': 'i8',
+ 'r8': 'r8',
+ 'optarch': 'xHost',
+ 'ieee': 'fltconsistency',
+ 'strict': ['fp-speculation=strict', 'fp-model strict'],
+ 'precise': ['fp-model precise'],
+ 'defaultprec': ['ftz', 'fp-speculation=safe', 'fp-model source'],
+ 'loose': ['fp-model fast=1'],
+ 'veryloose': ['fp-model fast=2'],
+ 'vectorize': {False: 'no-vec', True: 'vec'},
+ 'intel-static': 'static-intel',
+ 'no-icc': 'no-icc',
+ 'error-unknown-option': 'we10006', # error at warning #10006: ignoring unknown option
+ }
+
+ # used when 'optarch' toolchain option is enabled (and --optarch is not specified)
+ COMPILER_OPTIMAL_ARCHITECTURE_OPTION = {
+ (systemtools.X86_64, systemtools.AMD): 'xHost',
+ (systemtools.X86_64, systemtools.INTEL): 'xHost',
+ }
+ # used with --optarch=GENERIC
+ COMPILER_GENERIC_OPTION = {
+ (systemtools.X86_64, systemtools.AMD): 'xSSE2',
+ (systemtools.X86_64, systemtools.INTEL): 'xSSE2',
+ }
+
+ COMPILER_CC = 'icc'
+ COMPILER_CXX = 'icpc'
+ COMPILER_C_UNIQUE_FLAGS = ['intel-static', 'no-icc']
+
+ COMPILER_F77 = 'ifort'
+ COMPILER_F90 = 'ifort'
+ COMPILER_FC = 'ifort'
+ COMPILER_F_UNIQUE_FLAGS = ['intel-static']
+
+ LINKER_TOGGLE_STATIC_DYNAMIC = {
+ 'static': '-Bstatic',
+ 'dynamic':'-Bdynamic',
+ }
+
+ LIB_MULTITHREAD = ['iomp5', 'pthread'] # iomp5 is OpenMP related
+
+ def __init__(self, *args, **kwargs):
+ """Toolchain constructor."""
+ class_constants = kwargs.setdefault('class_constants', [])
+ class_constants.append('LIB_MULTITHREAD')
+
+ super(IntelIccIfort, self).__init__(*args, **kwargs)
+
+ def _set_compiler_vars(self):
+ """Intel compilers-specific adjustments after setting compiler variables."""
+ super(IntelIccIfort, self)._set_compiler_vars()
+
+ if not ('icc' in self.COMPILER_MODULE_NAME and 'ifort' in self.COMPILER_MODULE_NAME):
+ raise EasyBuildError("_set_compiler_vars: missing icc and/or ifort from COMPILER_MODULE_NAME %s",
+ self.COMPILER_MODULE_NAME)
+
+ icc_root, _ = self.get_software_root(self.COMPILER_MODULE_NAME)[0:2]
+ icc_version, ifort_version = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+
+ if not ifort_version == icc_version:
+ raise EasyBuildError("_set_compiler_vars: mismatch between icc version %s and ifort version %s",
+ icc_version, ifort_version)
+
+ if LooseVersion(icc_version) < LooseVersion('2011'):
+ self.LIB_MULTITHREAD.insert(1, "guide")
+
+ libpaths = ['intel64']
+ if self.options.get('32bit', None):
+ libpaths.append('ia32')
+ libpaths = ['lib/%s' % x for x in libpaths]
+ if LooseVersion(icc_version) > LooseVersion('2011.4') and LooseVersion(icc_version) < LooseVersion('2013_sp1'):
+ libpaths = ['compiler/%s' % x for x in libpaths]
+
+ self.variables.append_subdirs("LDFLAGS", icc_root, subdirs=libpaths)
+
+ def set_variables(self):
+ """Set the variables."""
+ # -fopenmp is not supported in old versions (11.x)
+ icc_version, _ = self.get_software_version(self.COMPILER_MODULE_NAME)[0:2]
+ if LooseVersion(icc_version) < LooseVersion('12'):
+ self.options.options_map['openmp'] = 'openmp'
+
+ super(IntelIccIfort, self).set_variables()
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/pgi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/pgi.py
index 38b51f2..bafd97c 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/compiler/pgi.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/compiler/pgi.py
@@ -39,14 +39,14 @@ from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.toolchain.compiler import Compiler
-TC_CONSTANT_PGI = "PGI"
+TC_CONSTANT_PGI = "pgi"
class Pgi(Compiler):
"""PGI compiler class
"""
- COMPILER_MODULE_NAME = ['PGI']
+ COMPILER_MODULE_NAME = ['pgi']
COMPILER_FAMILY = TC_CONSTANT_PGI
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/craypgi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/craypgi.py
index 03cdac0..d0ba325 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/craypgi.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/craypgi.py
@@ -32,5 +32,5 @@ from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
class CrayPGI(CrayPEPGI, CrayMPICH):
"""Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (PGI) (PrgEnv-pgi)."""
- NAME = 'CrayPGI'
+ NAME = 'craypgi'
SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/fft/fftw.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/fft/fftw.py
index 5e47614..4b1ab85 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/fft/fftw.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/fft/fftw.py
@@ -38,7 +38,7 @@ from easybuild.tools.toolchain.fft import Fft
class Fftw(Fft):
"""FFTW FFT library"""
- FFT_MODULE_NAME = ['FFTW']
+ FFT_MODULE_NAME = ['fftw']
def _set_fftw_variables(self):
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/fft/intelfftw.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/fft/intelfftw.py
index 3b916e7..08952d8 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/fft/intelfftw.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/fft/intelfftw.py
@@ -40,7 +40,7 @@ from easybuild.tools.modules import get_software_root, get_software_version
class IntelFFTW(Fftw):
"""FFTW wrapper functionality of Intel MKL"""
- FFT_MODULE_NAME = ['imkl']
+ FFT_MODULE_NAME = ['intel'] #['imkl']
FFT_LIB_GROUP = True
FFT_LIB_STATIC = True
@@ -58,10 +58,10 @@ class IntelFFTW(Fftw):
if self.options.get('i8', None):
bitsuff = '_ilp64'
compsuff = '_intel'
- if get_software_root('icc') is None:
- if get_software_root('PGI'):
+ if get_software_root('icc') is None and get_software_root('intel') is None:
+ if get_software_root('pgi'):
compsuff = '_pgi'
- elif get_software_root('GCC'):
+ elif get_software_root('gcc'):
compsuff = '_gnu'
else:
error_msg = "Not using Intel compilers, PGI nor GCC, don't know compiler suffix for FFTW libraries."
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcc.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcc.py
index 7a691ea..fe43680 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcc.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcc.py
@@ -33,7 +33,7 @@ from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
class GccToolchain(GCCcore):
"""Simple toolchain with just the GCC compilers."""
- NAME = 'GCC'
+ NAME = 'gcc'
COMPILER_MODULE_NAME = [NAME]
SUBTOOLCHAIN = [GCCcore.NAME, DUMMY_TOOLCHAIN_NAME]
OPTIONAL = False
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcccore.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcccore.py
index 1765ae7..8881c3b 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcccore.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcccore.py
@@ -33,7 +33,7 @@ from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
class GCCcore(Gcc):
"""Compiler-only toolchain, including only GCC and binutils."""
- NAME = 'GCCcore'
+ NAME = 'gcccore'
# Replace the default compiler module name with our own
COMPILER_MODULE_NAME = [NAME]
SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcccuda.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcccuda.py
index 9d6a2b8..26117fb 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gcccuda.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gcccuda.py
@@ -37,5 +37,5 @@ class GccCUDA(GccToolchain, Cuda):
"""Compiler toolchain with GCC and CUDA."""
NAME = 'gcccuda'
- COMPILER_MODULE_NAME = ['GCC', 'CUDA']
+ COMPILER_MODULE_NAME = ['gcc', 'cuda']
SUBTOOLCHAIN = GccToolchain.NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gnu.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gnu.py
index f5c6d8e..61ac447 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/gnu.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gnu.py
@@ -34,5 +34,5 @@ from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
class GNU(Gcc):
"""Compiler-only toolchain, including only GCC and binutils."""
- NAME = 'GNU'
+ NAME = 'gnu'
SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
diff --git a/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gopenmpi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gopenmpi.py
new file mode 100644
index 0000000..3a1bed3
--- /dev/null
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/gopenmpi.py
@@ -0,0 +1,40 @@
+##
+# Copyright 2012-2017 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for gompi compiler toolchain (includes GCC and OpenMPI).
+
+:author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.gcc import GccToolchain
+from easybuild.toolchains.mpi.openmpi import OpenMPI
+
+
+class GOpenMPI(GccToolchain, OpenMPI):
+ """Compiler toolchain with GCC and OpenMPI."""
+ NAME = 'gopenmpi'
+
+#git clone https://github.com/infphilo/tophat.git
+ SUBTOOLCHAIN = GccToolchain.NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/iccifort.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iccifort.py
index f6038d4..2d2a458 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/iccifort.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iccifort.py
@@ -40,7 +40,7 @@ class IccIfort(IntelIccIfort):
NAME = 'iccifort'
# use GCCcore as subtoolchain rather than GCC, since two 'real' compiler-only toolchains don't mix well,
# in particular in a hierarchical module naming scheme
- SUBTOOLCHAIN = [GCCcore.NAME, DUMMY_TOOLCHAIN_NAME]
+ SUBTOOLCHAIN = [DUMMY_TOOLCHAIN_NAME] # [GCCcore.NAME, DUMMY_TOOLCHAIN_NAME]
OPTIONAL = False
def is_deprecated(self):
diff --git a/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iintelmpi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iintelmpi.py
new file mode 100644
index 0000000..a1905d0
--- /dev/null
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iintelmpi.py
@@ -0,0 +1,45 @@
+##
+# Copyright 2012-2017 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for imvapich2 compiler toolchain (includes Intel compilers (icc, ifort), MVAPICH2,
+Intel Math Kernel Library (MKL), and Intel FFTW wrappers.
+:author: Karsten Siller
+
+based on iompi.py toolchain
+:author: Stijn De Weirdt (Ghent University)
+:author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.intel import Intel
+# from easybuild.toolchains.iccifort import IccIfort
+from easybuild.toolchains.mpi.intelmpi import IntelMPI
+
+
+class Imvapich2(Intel, IntelMPI):
+ """
+ Compiler toolchain with Intel compilers (icc/ifort), MKL, and MVAPICH2.
+ """
+ NAME = 'iintelmpi'
+ SUBTOOLCHAIN = Intel.NAME
diff --git a/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/imvapich2.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/imvapich2.py
new file mode 100644
index 0000000..a1b3f71
--- /dev/null
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/imvapich2.py
@@ -0,0 +1,45 @@
+##
+# Copyright 2012-2017 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for imvapich2 compiler toolchain (includes Intel compilers (icc, ifort), MVAPICH2,
+Intel Math Kernel Library (MKL), and Intel FFTW wrappers.
+:author: Karsten Siller
+
+based on iompi.py toolchain
+:author: Stijn De Weirdt (Ghent University)
+:author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.intel import Intel
+# from easybuild.toolchains.iccifort import IccIfort
+from easybuild.toolchains.mpi.mvapich2 import Mvapich2
+
+
+class Imvapich2(Intel, Mvapich2):
+ """
+ Compiler toolchain with Intel compilers (icc/ifort), MKL, and MVAPICH2.
+ """
+ NAME = 'imvapich2'
+ SUBTOOLCHAIN = Intel.NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/intel.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/intel.py
index 248e724..7da45e4 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/intel.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/intel.py
@@ -31,19 +31,20 @@ Intel Math Kernel Library (MKL), and Intel FFTW wrappers).
"""
from distutils.version import LooseVersion
-from easybuild.toolchains.iimpi import Iimpi
+# from easybuild.toolchains.iimpi import Iimpi
+from easybuild.toolchains.iccifort import IccIfort
from easybuild.toolchains.iimkl import Iimkl
from easybuild.toolchains.fft.intelfftw import IntelFFTW
from easybuild.toolchains.linalg.intelmkl import IntelMKL
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
-
-class Intel(Iimpi, IntelMKL, IntelFFTW):
+class Intel(IccIfort, IntelMKL, IntelFFTW):
"""
Compiler toolchain with Intel compilers (icc/ifort), Intel MPI,
Intel Math Kernel Library (MKL) and Intel FFTW wrappers.
"""
NAME = 'intel'
- SUBTOOLCHAIN = [Iimpi.NAME, Iimkl.NAME]
+ SUBTOOLCHAIN = [DUMMY_TOOLCHAIN_NAME] #[IccIfort.NAME, Iimkl.NAME]
def is_deprecated(self):
"""Return whether or not this toolchain is deprecated."""
@@ -55,5 +56,5 @@ class Intel(Iimpi, IntelMKL, IntelFFTW):
deprecated = True
else:
deprecated = False
-
- return deprecated
+ # using version >=16.0 so above logic does not work on Rivanna
+ return False #deprecated
diff --git a/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iopenmpi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iopenmpi.py
new file mode 100644
index 0000000..a5904ff
--- /dev/null
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/iopenmpi.py
@@ -0,0 +1,45 @@
+##
+# Copyright 2012-2017 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild. If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for iomkl compiler toolchain (includes Intel compilers (icc, ifort), OpenMPI,
+Intel Math Kernel Library (MKL), and Intel FFTW wrappers.
+
+:author: Stijn De Weirdt (Ghent University)
+:author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.mpi.openmpi import OpenMPI
+from easybuild.toolchains.intel import Intel
+#from easybuild.toolchains.fft.intelfftw import IntelFFTW
+#from easybuild.toolchains.linalg.intelmkl import IntelMKL
+
+
+class IOpenMPI(Intel, OpenMPI):
+ """
+ Compiler toolchain with Intel compilers (icc/ifort), OpenMPI,
+ Intel Math Kernel Library (MKL) and Intel FFTW wrappers.
+ """
+ NAME = 'iopenmpi'
+ SUBTOOLCHAIN = Intel.NAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/acml.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/acml.py
index 297fd13..c4c5890 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/acml.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/acml.py
@@ -38,14 +38,14 @@ from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_ACML = 'ACML'
+TC_CONSTANT_ACML = 'acml'
class Acml(LinAlg):
"""
Provides ACML BLAS/LAPACK support.
"""
- BLAS_MODULE_NAME = ['ACML']
+ BLAS_MODULE_NAME = ['acml']
# full list of libraries is highly dependent on ACML version and toolchain compiler (ifort, gfortran, ...)
BLAS_LIB = ['acml']
BLAS_LIB_MT = ['acml_mp']
@@ -54,7 +54,7 @@ class Acml(LinAlg):
# is completed in _set_blas_variables, depends on compiler used
BLAS_LIB_DIR = []
- LAPACK_MODULE_NAME = ['ACML']
+ LAPACK_MODULE_NAME = ['acml']
LAPACK_IS_BLAS = True
LAPACK_FAMILY = TC_CONSTANT_ACML
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/atlas.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/atlas.py
index 6348038..a5767e8 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/atlas.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/atlas.py
@@ -32,7 +32,7 @@ Support for ATLAS as toolchain linear algebra library.
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_ATLAS = 'ATLAS'
+TC_CONSTANT_ATLAS = 'atlas'
class Atlas(LinAlg):
@@ -40,11 +40,11 @@ class Atlas(LinAlg):
Provides ATLAS BLAS/LAPACK support.
LAPACK is a build dependency only
"""
- BLAS_MODULE_NAME = ['ATLAS']
+ BLAS_MODULE_NAME = ['atlas']
BLAS_LIB = ["cblas", "f77blas", "atlas"]
BLAS_LIB_MT = ["ptcblas", "ptf77blas", "atlas"]
BLAS_FAMILY = TC_CONSTANT_ATLAS
- LAPACK_MODULE_NAME = ['ATLAS']
+ LAPACK_MODULE_NAME = ['atlas']
LAPACK_LIB = ['lapack']
LAPACK_FAMILY = TC_CONSTANT_ATLAS
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/blacs.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/blacs.py
index bc38cb7..bc49450 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/blacs.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/blacs.py
@@ -36,7 +36,7 @@ class Blacs(LinAlg):
"""
Trivial class, provides BLACS support.
"""
- BLACS_MODULE_NAME = ['BLACS']
+ BLACS_MODULE_NAME = ['blacs']
BLACS_LIB = ["blacsCinit", "blacsF77init", "blacs"]
BLACS_LIB_GROUP = True
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/blis.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/blis.py
index d1ad2d4..b038581 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/blis.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/blis.py
@@ -32,13 +32,13 @@ Support for BLIS as toolchain linear algebra library.
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_BLIS = 'BLIS'
+TC_CONSTANT_BLIS = 'blis'
class Blis(LinAlg):
"""
Trivial class, provides BLIS support.
"""
- BLAS_MODULE_NAME = ['BLIS']
+ BLAS_MODULE_NAME = ['blis']
BLAS_LIB = ['blis']
BLAS_FAMILY = TC_CONSTANT_BLIS
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/flame.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/flame.py
index 27bd08c..cac2427 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/flame.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/flame.py
@@ -32,11 +32,11 @@ Support for FLAME as toolchain linear algebra library.
from easybuild.toolchains.linalg.lapack import Lapack
-TC_CONSTANT_OPENBLAS = 'FLAME'
+TC_CONSTANT_OPENBLAS = 'flame'
class Flame(Lapack):
"""Less trivial module, provides FLAME support."""
- LAPACK_MODULE_NAME = ['FLAME'] + Lapack.LAPACK_MODULE_NAME # no super()
+ LAPACK_MODULE_NAME = ['flame'] + Lapack.LAPACK_MODULE_NAME # no super()
LAPACK_LIB = ['lapack2flame', 'flame'] + Lapack.LAPACK_LIB # no super()
LAPACK_FAMILY = TC_CONSTANT_FLAME
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/gotoblas.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/gotoblas.py
index a0265f5..77a6f53 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/gotoblas.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/gotoblas.py
@@ -32,13 +32,13 @@ Support for GotoBLAS as toolchain linear algebra library.
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_GOTOBLAS = 'GotoBLAS'
+TC_CONSTANT_GOTOBLAS = 'gotoblas'
class GotoBLAS(LinAlg):
"""
Trivial class, provides GotoBLAS support.
"""
- BLAS_MODULE_NAME = ['GotoBLAS']
+ BLAS_MODULE_NAME = ['gotoblas']
BLAS_LIB = ['goto']
BLAS_FAMILY = TC_CONSTANT_GOTOBLAS
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/intelmkl.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/intelmkl.py
index 33ae3a5..be8e337 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/intelmkl.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/intelmkl.py
@@ -49,7 +49,7 @@ class IntelMKL(LinAlg):
"""Support for Intel MKL."""
# library settings are inspired by http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor
- BLAS_MODULE_NAME = ['imkl']
+ BLAS_MODULE_NAME = ['intel'] # ['imkl']
BLAS_LIB_MAP = {
"lp64": '_lp64',
"interface": None,
@@ -61,17 +61,17 @@ class IntelMKL(LinAlg):
BLAS_LIB_STATIC = True
BLAS_FAMILY = TC_CONSTANT_INTELMKL
- LAPACK_MODULE_NAME = ['imkl']
+ LAPACK_MODULE_NAME = ['intel'] # ['imkl']
LAPACK_IS_BLAS = True
LAPACK_FAMILY = TC_CONSTANT_INTELMKL
- BLACS_MODULE_NAME = ['imkl']
+ BLACS_MODULE_NAME = ['intel'] # ['imkl']
BLACS_LIB = ["mkl_blacs%(mpi)s%(lp64)s"]
BLACS_LIB_MAP = {'mpi':None}
BLACS_LIB_GROUP = True
BLACS_LIB_STATIC = True
- SCALAPACK_MODULE_NAME = ['imkl']
+ SCALAPACK_MODULE_NAME = ['intel'] # ['imkl']
SCALAPACK_LIB = ["mkl_scalapack%(lp64_sc)s"]
SCALAPACK_LIB_MT = ["mkl_scalapack%(lp64_sc)s"]
SCALAPACK_LIB_MAP = {'lp64_sc': '_lp64'}
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/lapack.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/lapack.py
index 38ae063..729bd0e 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/lapack.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/lapack.py
@@ -32,11 +32,11 @@ Support for LAPACK as toolchain linear algebra library.
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_LAPACK = 'LAPACK'
+TC_CONSTANT_LAPACK = 'lapack'
class Lapack(LinAlg):
"""Trivial class, provides LAPACK support."""
- LAPACK_MODULE_NAME = ['LAPACK']
+ LAPACK_MODULE_NAME = ['lapack']
LAPACK_LIB = ['lapack']
LAPACK_FAMILY = TC_CONSTANT_LAPACK
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/libsci.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/libsci.py
index 6a1dd8e..5ff5ff3 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/libsci.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/libsci.py
@@ -36,7 +36,7 @@ from easybuild.tools.toolchain.linalg import LinAlg
CRAY_LIBSCI_MODULE_NAME = 'cray-libsci'
-TC_CONSTANT_CRAY_LIBSCI = 'CrayLibSci'
+TC_CONSTANT_CRAY_LIBSCI = 'craylibsci'
class LibSci(LinAlg):
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/openblas.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/openblas.py
index ebad2c2..9d7c60c 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/openblas.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/openblas.py
@@ -31,17 +31,17 @@ Support for OpenBLAS as toolchain linear algebra library.
from easybuild.tools.toolchain.linalg import LinAlg
-TC_CONSTANT_OPENBLAS = 'OpenBLAS'
+TC_CONSTANT_OPENBLAS = 'openblas'
class OpenBLAS(LinAlg):
"""
Trivial class, provides OpenBLAS support.
"""
- BLAS_MODULE_NAME = ['OpenBLAS']
+ BLAS_MODULE_NAME = ['openblas']
BLAS_LIB = ['openblas']
BLAS_FAMILY = TC_CONSTANT_OPENBLAS
- LAPACK_MODULE_NAME = ['OpenBLAS']
+ LAPACK_MODULE_NAME = ['openblas']
LAPACK_IS_BLAS = True
LAPACK_FAMILY = TC_CONSTANT_OPENBLAS
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/scalapack.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/scalapack.py
index bb4c81d..d9f8f1c 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/linalg/scalapack.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/linalg/scalapack.py
@@ -36,12 +36,12 @@ from easybuild.toolchains.linalg.blacs import Blacs
class ScaLAPACK(Blacs):
"""Trivial class, provides ScaLAPACK support (on top of BLACS)."""
- SCALAPACK_MODULE_NAME = ['ScaLAPACK']
+ SCALAPACK_MODULE_NAME = ['scalapack']
SCALAPACK_LIB = ['scalapack']
def is_required(self, name):
"""Determine whether BLACS is a required toolchain element, based on ScaLAPACK version."""
- if name == "BLACS":
+ if name == "blacs":
# BLACS is no longer required for ScaLAPACK >= 2.0
return LooseVersion(self.get_software_version(self.SCALAPACK_MODULE_NAME)[0]) < LooseVersion("2.0")
else:
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/intelmpi.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/intelmpi.py
index 4d6883a..1f3afd3 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/intelmpi.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/intelmpi.py
@@ -40,7 +40,7 @@ TC_CONSTANT_INTELMPI = "IntelMPI"
class IntelMPI(Mpich2):
"""Intel MPI class"""
- MPI_MODULE_NAME = ['impi']
+ MPI_MODULE_NAME = ['intelmpi']
MPI_FAMILY = TC_CONSTANT_INTELMPI
MPI_LIBRARY_NAME = 'mpi'
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mpich.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mpich.py
index 7174364..90aa65d 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mpich.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mpich.py
@@ -42,7 +42,7 @@ TC_CONSTANT_MPI_TYPE_MPICH = "MPI_TYPE_MPICH"
class Mpich(Mpi):
"""MPICH MPI class"""
- MPI_MODULE_NAME = ['MPICH']
+ MPI_MODULE_NAME = ['mpich']
MPI_FAMILY = TC_CONSTANT_MPICH
MPI_TYPE = TC_CONSTANT_MPI_TYPE_MPICH
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mpich2.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mpich2.py
index 57259ce..9a7ce3c 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mpich2.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mpich2.py
@@ -38,7 +38,7 @@ TC_CONSTANT_MPI_TYPE_MPICH = "MPI_TYPE_MPICH"
class Mpich2(Mpich):
"""MPICH2 MPI class"""
- MPI_MODULE_NAME = ["MPICH2"]
+ MPI_MODULE_NAME = ["mpich2"]
MPI_FAMILY = TC_CONSTANT_MPICH2
MPI_TYPE = TC_CONSTANT_MPI_TYPE_MPICH
diff --git a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mvapich2.py b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mvapich2.py
index 501e73f..1b1d85f 100644
--- a/home/uvacse/git/easybuild-framework/easybuild/toolchains/mpi/mvapich2.py
+++ b/apps/software/EasyBuild/3.9.0/lib/python2.7/site-packages/easybuild_framework-3.9.0-py2.7.egg/easybuild/toolchains/mpi/mvapich2.py
@@ -32,12 +32,12 @@ Support for MVAPICH2 as toolchain MPI library.
from easybuild.toolchains.mpi.mpich2 import Mpich2
-TC_CONSTANT_MVAPICH2 = "MVAPICH2"