impi-devel 2021.10.0__py2.py3-none-manylinux1_x86_64.whl → 2021.12.0__py2.py3-none-manylinux1_x86_64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of impi-devel might be problematic. Click here for more details.

Files changed (22) hide show
  1. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpicc +31 -19
  2. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpicxx +31 -19
  3. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpif77 +34 -39
  4. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpif90 +34 -38
  5. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpifc +31 -19
  6. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpigcc +29 -32
  7. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpigxx +28 -33
  8. impi_devel-2021.10.0.data/data/bin/mpiicx → impi_devel-2021.12.0.data/data/bin/mpiicc +14 -8
  9. impi_devel-2021.10.0.data/data/bin/mpiicpx → impi_devel-2021.12.0.data/data/bin/mpiicpc +14 -8
  10. impi_devel-2021.10.0.data/data/bin/mpiicpc → impi_devel-2021.12.0.data/data/bin/mpiicpx +41 -40
  11. impi_devel-2021.10.0.data/data/bin/mpiicc → impi_devel-2021.12.0.data/data/bin/mpiicx +28 -30
  12. impi_devel-2021.10.0.data/data/bin/mpiifx → impi_devel-2021.12.0.data/data/bin/mpiifort +18 -8
  13. impi_devel-2021.10.0.data/data/bin/mpiifort → impi_devel-2021.12.0.data/data/bin/mpiifx +36 -36
  14. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/include/mpi.h +1069 -434
  15. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/include/mpicxx.h +35 -35
  16. {impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/include/mpio.h +149 -0
  17. {impi_devel-2021.10.0.dist-info → impi_devel-2021.12.0.dist-info}/METADATA +2 -2
  18. impi_devel-2021.12.0.dist-info/RECORD +21 -0
  19. impi_devel-2021.10.0.dist-info/RECORD +0 -21
  20. {impi_devel-2021.10.0.dist-info → impi_devel-2021.12.0.dist-info}/LICENSE.txt +0 -0
  21. {impi_devel-2021.10.0.dist-info → impi_devel-2021.12.0.dist-info}/WHEEL +0 -0
  22. {impi_devel-2021.10.0.dist-info → impi_devel-2021.12.0.dist-info}/top_level.txt +0 -0
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpicc RENAMED
@@ -14,6 +14,7 @@
14
14
  #
15
15
 
16
16
  default_compiler_name="gcc"
17
+ user_set_compiler=0
17
18
 
18
19
  #------------------------------------------------------------------------------
19
20
  # Print mini-help if started without parameters
@@ -35,6 +36,7 @@ for arg in "$@" ; do
35
36
  case $arg in
36
37
  -cc=*)
37
38
  compiler_name=`echo A$arg | sed -e 's/A-cc=//g'`
39
+ user_set_compiler=1
38
40
  ;;
39
41
  esac
40
42
  done
@@ -47,24 +49,34 @@ if [ $# -eq 1 -a "$1" = "-v" ] ; then
47
49
  opt_args="-nolinkage"
48
50
  fi
49
51
 
50
- if [ x"$opt_args" == x"" ]; then
51
- case "${compiler_short_name}" in
52
- icc|icx) "$dir"/mpiicc -cc=$compiler_name "$@" ;;
53
- cc|*gcc*|clang*) "$dir"/mpigcc -cc=$compiler_name "$@" ;;
54
- mpicc) "$dir"/mpigcc "$@" ;;
55
- *)
56
- echo "Error: unsupported compiler name '$compiler_name'."
57
- echo "Check -cc=<compiler_name> command line option and I_MPI_CC='$I_MPI_CC' and MPICH_CC='$MPICH_CC' variables.";
58
- exit 1 ;;
59
- esac
52
+ if [ $user_set_compiler -eq 0 ]; then
53
+ # default compiler
54
+ if [ x"$opt_args" == x"" ]; then
55
+ "$dir"/mpigcc -cc=$compiler_name "$@"
56
+ else
57
+ "$dir"/mpigcc -cc=$compiler_name "$@" $opt_args
58
+ fi
60
59
  else
61
- case "${compiler_short_name}" in
62
- icc|icx) "$dir"/mpiicc -cc=$compiler_name "$@" $opt_args ;;
63
- cc|*gcc*|clang*) "$dir"/mpigcc -cc=$compiler_name "$@" $opt_args ;;
64
- mpicc) "$dir"/mpigcc "$@" $opt_args ;;
65
- *)
66
- echo "Error: unsupported compiler name '$compiler_name'."
67
- echo "Check -cc=<compiler_name> command line option and I_MPI_CC='$I_MPI_CC' and MPICH_CC='$MPICH_CC' variables.";
68
- exit 1 ;;
69
- esac
60
+ # don't need to duplicate -cc since user already provided the option
61
+ if [ x"$opt_args" == x"" ]; then
62
+ case "${compiler_short_name}" in
63
+ icc|icx) "$dir"/mpiicx "$@" ;;
64
+ cc|*gcc*|clang*) "$dir"/mpigcc "$@" ;;
65
+ mpicc) "$dir"/mpigcc "$@" ;;
66
+ *)
67
+ echo "Error: unsupported compiler name '$compiler_name'."
68
+ echo "Check -cc=<compiler_name> command line option and I_MPI_CC='$I_MPI_CC' and MPICH_CC='$MPICH_CC' variables.";
69
+ exit 1 ;;
70
+ esac
71
+ else
72
+ case "${compiler_short_name}" in
73
+ icc|icx) "$dir"/mpiicx "$@" $opt_args ;;
74
+ cc|*gcc*|clang*) "$dir"/mpigcc "$@" $opt_args ;;
75
+ mpicc) "$dir"/mpigcc "$@" $opt_args ;;
76
+ *)
77
+ echo "Error: unsupported compiler name '$compiler_name'."
78
+ echo "Check -cc=<compiler_name> command line option and I_MPI_CC='$I_MPI_CC' and MPICH_CC='$MPICH_CC' variables.";
79
+ exit 1 ;;
80
+ esac
81
+ fi
70
82
  fi
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpicxx RENAMED
@@ -14,6 +14,7 @@
14
14
  #
15
15
 
16
16
  default_compiler_name="g++"
17
+ user_set_compiler=0
17
18
 
18
19
  #------------------------------------------------------------------------------
19
20
  # Print mini-help if started without parameters
@@ -35,6 +36,7 @@ for arg in "$@" ; do
35
36
  case $arg in
36
37
  -cxx=*)
37
38
  compiler_name=`echo A$arg | sed -e 's/A-cxx=//g'`
39
+ user_set_compiler=1
38
40
  ;;
39
41
  esac
40
42
  done
@@ -47,24 +49,34 @@ if [ $# -eq 1 -a "$1" = "-v" ] ; then
47
49
  opt_args="-nolinkage"
48
50
  fi
49
51
 
50
- if [ x"$opt_args" == x"" ]; then
51
- case "${compiler_short_name}" in
52
- icc|icpc|icpx|dpcpp) "$dir"/mpiicpc -cxx=$compiler_name "$@" ;;
53
- *g++*) "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
54
- mpicxx) "$dir"/mpigxx "$@" ;;
55
- *)
56
- echo "Error: unsupported compiler name '$compiler_name'."
57
- echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";
58
- exit 1 ;;
59
- esac
52
+ if [ $user_set_compiler -eq 0 ]; then
53
+ # default compiler
54
+ if [ x"$opt_args" == x"" ]; then
55
+ "$dir"/mpigxx -cxx=$compiler_name "$@"
56
+ else
57
+ "$dir"/mpigxx -cxx=$compiler_name "$@" $opt_args
58
+ fi
60
59
  else
61
- case "${compiler_short_name}" in
62
- icc|icpc|icpx|dpcpp) "$dir"/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
63
- *g++*) "$dir"/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
64
- mpicxx) "$dir"/mpigxx "$@" $opt_args ;;
65
- *)
66
- echo "Error: unsupported compiler name '$compiler_name'."
67
- echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";
68
- exit 1 ;;
69
- esac
60
+ # don't need to duplicate -cc since user already provided the option
61
+ if [ x"$opt_args" == x"" ]; then
62
+ case "${compiler_short_name}" in
63
+ icc|icpc|icpx|dpcpp) "$dir"/mpiicpx "$@" ;;
64
+ *g++*) "$dir"/mpigxx "$@" ;;
65
+ mpicxx) "$dir"/mpigxx "$@" ;;
66
+ *)
67
+ echo "Error: unsupported compiler name '$compiler_name'."
68
+ echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";
69
+ exit 1 ;;
70
+ esac
71
+ else
72
+ case "${compiler_short_name}" in
73
+ icc|icpc|icpx|dpcpp) "$dir"/mpiicpx "$@" $opt_args ;;
74
+ *g++*) "$dir"/mpigxx "$@" $opt_args ;;
75
+ mpicxx) "$dir"/mpigxx "$@" $opt_args ;;
76
+ *)
77
+ echo "Error: unsupported compiler name '$compiler_name'."
78
+ echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";
79
+ exit 1 ;;
80
+ esac
81
+ fi
70
82
  fi
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpif77 RENAMED
@@ -97,8 +97,8 @@
97
97
  # Directory locations: Fixed for any MPI implementation.
98
98
  # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
99
99
  prefix=I_MPI_SUBSTITUTE_INSTALLDIR
100
- if [ -n "$I_MPI_ROOT" ] ; then
101
- prefix=$I_MPI_ROOT;
100
+ if [ -n "${I_MPI_ROOT}" ] ; then
101
+ prefix="${I_MPI_ROOT}";
102
102
  fi
103
103
 
104
104
  exec_prefix=__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__
@@ -106,6 +106,15 @@ sysconfdir=${prefix}/etc
106
106
  includedir=${prefix}/include
107
107
  libdir=${prefix}/lib
108
108
 
109
+ if [ ! -f "${prefix}/lib/mpi/debug/libmpi.so" ]; then
110
+ release_lib_dir="/release"
111
+ debug_lib_dir="/debug"
112
+ else
113
+ sysconfdir=${prefix}/opt/mpi/etc
114
+ release_lib_dir=""
115
+ debug_lib_dir="/mpi/debug"
116
+ fi
117
+ MPILIBDIR=${release_lib_dir}
109
118
  # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
110
119
  # folder where *.conf files are placed
111
120
  if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
@@ -117,13 +126,13 @@ fi
117
126
  F77="gfortran"
118
127
  F77CPP=""
119
128
  MPICH_VERSION="3.4a2"
120
- MPIVERSION="2021.10"
129
+ MPIVERSION="2021.12"
121
130
  FFLAGS=""
122
131
  MPILIBNAME="mpi"
123
132
 
124
133
 
125
134
  # How to pass a linker flag through the compiler.
126
- wl="-Wl,"
135
+ wl=""
127
136
 
128
137
  # Static library suffix (normally "a").
129
138
  libext="a"
@@ -142,8 +151,8 @@ library_names_spec="\$libname\$shrext"
142
151
  hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
143
152
 
144
153
  # Flag to add dtags to allow using runpath instead of rpath
145
- enable_dtags_flag="-Wl,--enable-new-dtags"
146
- disable_dtags_flag="-Wl,--disable-new-dtags"
154
+ enable_dtags_flag=""
155
+ disable_dtags_flag=""
147
156
 
148
157
  # Whether we need a single -rpath flag with a separated argument.
149
158
  hardcode_libdir_separator=""
@@ -420,7 +429,7 @@ for arg in "$@" ; do
420
429
  addarg=no
421
430
  ;;
422
431
  -g)
423
- MPILIBDIR="/release"
432
+ MPILIBDIR=${release_lib_dir}
424
433
  ;;
425
434
  -static_log)
426
435
  static_log=yes
@@ -595,37 +604,23 @@ fi
595
604
 
596
605
  if [ -n "$mpilib_override" ] ; then
597
606
  case "$mpilib_override" in
598
- opt )
599
- MPILIBDIR="/release"
600
- ;;
601
- opt_mt )
602
- MPILIBDIR="/release"
603
- MPILIBDIR_MT="mt"
604
- ;;
605
- dbg )
606
- MPILIBDIR="/debug"
607
- ;;
608
- dbg_mt )
609
- MPILIBDIR="/debug"
610
- MPILIBDIR_MT="mt"
611
- ;;
612
- * )
613
- echo "Warning: incorrect library version specified. Automatically selected library will be used."
614
- ;;
607
+ opt )
608
+ MPILIBDIR=${release_lib_dir}
609
+ ;;
610
+ opt_mt )
611
+ MPILIBDIR=${release_lib_dir}
612
+ ;;
613
+ dbg )
614
+ MPILIBDIR=${debug_lib_dir}
615
+ ;;
616
+ dbg_mt )
617
+ MPILIBDIR=${debug_lib_dir}
618
+ ;;
619
+ * )
620
+ echo "Warning: incorrect library version specified. Automatically selected library will be used."
621
+ ;;
615
622
  esac
616
623
  fi
617
-
618
- # -----------------------------------------------------------------------
619
- case "$MPILIBDIR" in
620
- release | /release | debug | /debug)
621
- if [ ! -z "$MPILIBDIR_MT" ]; then
622
- MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
623
- fi
624
- ;;
625
- "" )
626
- MPILIBDIR=/release
627
- ;;
628
- esac
629
624
  # -----------------------------------------------------------------------
630
625
  if [ "$static_mpi" = yes ] ; then
631
626
  mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
@@ -704,10 +699,10 @@ else
704
699
  fi
705
700
  if [ "$linking" = yes ] ; then
706
701
  if [ "$nativelinking" = yes ] ; then
707
- $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} $allargs -I\"${includedir}\"
702
+ $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} $allargs -I\"${includedir}\" -I\"${includedir}/mpi\"
708
703
  rc=$?
709
704
  else
710
- $Show $F77 $FFLAGS $allargs -I\"${includedir}\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $mpilibs $I_MPI_OTHERLIBS ${final_ldflags}
705
+ $Show $F77 $FFLAGS $allargs -I\"${includedir}\" -I\"${includedir}/mpi\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $mpilibs $I_MPI_OTHERLIBS ${final_ldflags}
711
706
  rc=$?
712
707
  if [ $rc -eq 0 -a "x$strip_debug_info" = "xyes" ] ; then
713
708
  $Show objcopy --only-keep-debug ${executable} ${executable}.dbg
@@ -722,7 +717,7 @@ if [ "$linking" = yes ] ; then
722
717
  # rc=$?
723
718
  # fi
724
719
  else
725
- cmd_line="$F77 $PROFILE_INCPATHS ${final_fflags} $allargs -I\"${includedir}\""
720
+ cmd_line="$F77 $PROFILE_INCPATHS ${final_fflags} $allargs -I\"${includedir}\" -I\"${includedir}/mpi\""
726
721
  if [ "$Show" = echo ] ; then
727
722
  echo $cmd_line
728
723
  else
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpif90 RENAMED
@@ -97,9 +97,9 @@
97
97
  # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
98
98
  prefix=I_MPI_SUBSTITUTE_INSTALLDIR
99
99
  # The environment variable I_MPI_ROOT may be used to override installation folder path
100
- if [ -n "$I_MPI_ROOT" ] ; then
101
- prefix=$I_MPI_ROOT;
102
- fi
100
+ if [ -n "${I_MPI_ROOT}" ] ; then
101
+ prefix="${I_MPI_ROOT}";
102
+ fi
103
103
 
104
104
  exec_prefix=__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__
105
105
  sysconfdir=${prefix}/etc
@@ -111,6 +111,16 @@ if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
111
111
  fi
112
112
  modincdir=${prefix}/include
113
113
 
114
+ if [ ! -f "${prefix}/lib/mpi/debug/libmpi.so" ]; then
115
+ release_lib_dir="/release"
116
+ debug_lib_dir="/debug"
117
+ else
118
+ sysconfdir=${prefix}/opt/mpi/etc
119
+ release_lib_dir=""
120
+ debug_lib_dir="/mpi/debug"
121
+ modincdir=${prefix}/include/mpi
122
+ fi
123
+ MPILIBDIR=${release_lib_dir}
114
124
  # Default settings for compiler, flags, and libraries
115
125
  # Determined by a combination of environment variables and tests within
116
126
  # configure (e.g., determining whehter -lsocket is needed)
@@ -130,13 +140,13 @@ FCMODINCSPEC=""
130
140
  FCEXT="f90"
131
141
  MPICH_VERSION="3.4a2"
132
142
  FCFLAGS=""
133
- MPIVERSION="2021.10"
143
+ MPIVERSION="2021.12"
134
144
  MPILIBNAME="mpi"
135
145
  enable_wrapper_rpath="@enable_wrapper_rpath@"
136
146
 
137
147
 
138
148
  # How to pass a linker flag through the compiler.
139
- wl="-Wl,"
149
+ wl=""
140
150
 
141
151
  # Static library suffix (normally "a").
142
152
  libext="a"
@@ -155,8 +165,8 @@ library_names_spec="\$libname\$shrext"
155
165
  hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
156
166
 
157
167
  # Flag to add dtags to allow using runpath instead of rpath
158
- enable_dtags_flag="-Wl,--enable-new-dtags"
159
- disable_dtags_flag="-Wl,--disable-new-dtags"
168
+ enable_dtags_flag=""
169
+ disable_dtags_flag=""
160
170
 
161
171
  # Whether we need a single -rpath flag with a separated argument.
162
172
  hardcode_libdir_separator=""
@@ -441,7 +451,7 @@ for arg in "$@" ; do
441
451
  addarg=no
442
452
  ;;
443
453
  -g)
444
- MPILIBDIR="/release"
454
+ MPILIBDIR=${release_lib_dir}
445
455
  ;;
446
456
  -static_log)
447
457
  static_log=yes
@@ -622,38 +632,24 @@ fi
622
632
 
623
633
  if [ -n "$mpilib_override" ] ; then
624
634
  case "$mpilib_override" in
625
- opt )
626
- MPILIBDIR="/release"
627
- ;;
628
- opt_mt )
629
- MPILIBDIR="/release"
630
- MPILIBDIR_MT="mt"
631
- ;;
632
- dbg )
633
- MPILIBDIR="/debug"
634
- ;;
635
- dbg_mt )
636
- MPILIBDIR="/debug"
637
- MPILIBDIR_MT="mt"
638
- ;;
639
- * )
640
- echo "Warning: incorrect library version specified. Automatically selected library will be used."
641
- ;;
635
+ opt )
636
+ MPILIBDIR=${release_lib_dir}
637
+ ;;
638
+ opt_mt )
639
+ MPILIBDIR=${release_lib_dir}
640
+ ;;
641
+ dbg )
642
+ MPILIBDIR=${debug_lib_dir}
643
+ ;;
644
+ dbg_mt )
645
+ MPILIBDIR=${debug_lib_dir}
646
+ ;;
647
+ * )
648
+ echo "Warning: incorrect library version specified. Automatically selected library will be used."
649
+ ;;
642
650
  esac
643
651
  fi
644
-
645
652
  # -----------------------------------------------------------------------
646
- case "$MPILIBDIR" in
647
- release | /release | debug | /debug)
648
- if [ ! -z "$MPILIBDIR_MT" ]; then
649
- MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
650
- fi
651
- ;;
652
- "" )
653
- MPILIBDIR=/release
654
- ;;
655
- esac
656
- # -----------------------------------------------------------------------
657
653
  # Choose mod file corresponded gfortran version
658
654
  # Tr#2270, Tr#2453, Tr#3206, Tr#3434
659
655
  gfort_ver=`$FC --version | head -n 1 | cut -d '(' -f1,2 | sed -e 's/\[.*//' | sed -e 's/.*(//' | sed -e 's/[a-zA-Z,/)]//g' | sed -e 's/^[[:space:]]*//' | sed -e 's/ .*//g' | sed -e 's/-.*//'`
@@ -842,7 +838,7 @@ if [ -z "${FCINC}" ] ; then
842
838
  else
843
839
  # Normally, FCINC is just -I, but some compilers have used different
844
840
  # command line arguments
845
- FCINCDIRS="${FCINC}\"${includedir}\""
841
+ FCINCDIRS="${FCINC}\"${includedir}\" ${FCINC}\"${includedir}/mpi\""
846
842
  fi
847
843
 
848
844
  # Handle the specification of the directory containing the modules
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpifc RENAMED
@@ -14,6 +14,7 @@
14
14
  #
15
15
 
16
16
  default_compiler_name="gfortran"
17
+ user_set_compiler=0
17
18
 
18
19
  #------------------------------------------------------------------------------
19
20
  # Print mini-help if started without parameters
@@ -35,6 +36,7 @@ for arg in "$@" ; do
35
36
  case $arg in
36
37
  -fc=*)
37
38
  compiler_name=`echo A$arg | sed -e 's/A-fc=//g'`
39
+ user_set_compiler=1
38
40
  ;;
39
41
  esac
40
42
  done
@@ -47,24 +49,34 @@ if [ $# -eq 1 -a "$1" = "-v" ] ; then
47
49
  opt_args="-nolinkage"
48
50
  fi
49
51
 
50
- if [ x"$opt_args" == x"" ]; then
51
- case "${compiler_short_name}" in
52
- ifort|ifx) "$dir"/mpiifort -fc=$compiler_name "$@" ;;
53
- *g77*) "$dir"/mpif77 -fc=$compiler_name "$@" ;;
54
- *gfortran*) "$dir"/mpif90 -fc=$compiler_name "$@" ;;
55
- *)
56
- echo "Error: unsupported compiler name '$compiler_name'."
57
- echo "Check -fc=<compiler_name> command line option and I_MPI_FC='$I_MPI_FC' and MPICH_FC='$MPICH_FC' variables.";
58
- exit 1 ;;
59
- esac
52
+ if [ $user_set_compiler -eq 0 ]; then
53
+ # default compiler
54
+ if [ x"$opt_args" == x"" ]; then
55
+ "$dir"/mpif90 -fc=$compiler_name "$@"
56
+ else
57
+ "$dir"/mpif90 -fc=$compiler_name "$@" $opt_args
58
+ fi
60
59
  else
61
- case "${compiler_short_name}" in
62
- ifort|ifx) "$dir"/mpiifort -fc=$compiler_name "$@" $opt_args ;;
63
- *g77*) "$dir"/mpif77 -fc=$compiler_name "$@" $opt_args ;;
64
- *gfortran*) "$dir"/mpif90 -fc=$compiler_name "$@" $opt_args ;;
65
- *)
66
- echo "Error: unsupported compiler name '$compiler_name'."
67
- echo "Check -fc=<compiler_name> command line option and I_MPI_FC='$I_MPI_FC' and MPICH_FC='$MPICH_FC' variables.";
68
- exit 1 ;;
69
- esac
60
+ # don't need to duplicate -cc since user already provided the option
61
+ if [ x"$opt_args" == x"" ]; then
62
+ case "${compiler_short_name}" in
63
+ ifort|ifx) "$dir"/mpiifx "$@" ;;
64
+ *g77*) "$dir"/mpif77 "$@" ;;
65
+ *gfortran*) "$dir"/mpif90 "$@" ;;
66
+ *)
67
+ echo "Error: unsupported compiler name '$compiler_name'."
68
+ echo "Check -fc=<compiler_name> command line option and I_MPI_FC='$I_MPI_FC' and MPICH_FC='$MPICH_FC' variables.";
69
+ exit 1 ;;
70
+ esac
71
+ else
72
+ case "${compiler_short_name}" in
73
+ ifort|ifx) "$dir"/mpiifx "$@" $opt_args ;;
74
+ *g77*) "$dir"/mpif77 "$@" $opt_args ;;
75
+ *gfortran*) "$dir"/mpif90 "$@" $opt_args ;;
76
+ *)
77
+ echo "Error: unsupported compiler name '$compiler_name'."
78
+ echo "Check -fc=<compiler_name> command line option and I_MPI_FC='$I_MPI_FC' and MPICH_FC='$MPICH_FC' variables.";
79
+ exit 1 ;;
80
+ esac
81
+ fi
70
82
  fi
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpigcc RENAMED
@@ -96,8 +96,8 @@
96
96
  # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
97
97
  prefix=I_MPI_SUBSTITUTE_INSTALLDIR
98
98
  # The environment variable I_MPI_ROOT may be used to override installation folder path
99
- if [ -n "$I_MPI_ROOT" ] ; then
100
- prefix=$I_MPI_ROOT;
99
+ if [ -n "${I_MPI_ROOT}" ] ; then
100
+ prefix="${I_MPI_ROOT}";
101
101
  fi
102
102
 
103
103
  exec_prefix=__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__
@@ -105,6 +105,15 @@ sysconfdir=${prefix}/etc
105
105
  includedir=${prefix}/include
106
106
  libdir=${prefix}/lib
107
107
 
108
+ if [ ! -f "${prefix}/lib/mpi/debug/libmpi.so" ]; then
109
+ release_lib_dir="/release"
110
+ debug_lib_dir="/debug"
111
+ else
112
+ sysconfdir=${prefix}/opt/mpi/etc
113
+ release_lib_dir=""
114
+ debug_lib_dir="/mpi/debug"
115
+ fi
116
+ MPILIBDIR=${release_lib_dir}
108
117
  # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
109
118
  # folder where *.conf files are placed
110
119
  if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
@@ -117,7 +126,7 @@ CC="gcc"
117
126
  MPICH_VERSION="3.4a2"
118
127
  CFLAGS=""
119
128
  CPPFLAGS=""
120
- MPIVERSION="2021.10"
129
+ MPIVERSION="2021.12"
121
130
  MPILIBNAME="mpi"
122
131
 
123
132
 
@@ -412,7 +421,7 @@ for arg in "$@" ; do
412
421
  addarg=no
413
422
  ;;
414
423
  -g)
415
- MPILIBDIR="/release"
424
+ MPILIBDIR=${release_lib_dir}
416
425
  ;;
417
426
  -static_log)
418
427
  static_log=yes
@@ -510,37 +519,25 @@ fi
510
519
 
511
520
  if [ -n "$mpilib_override" ] ; then
512
521
  case "$mpilib_override" in
513
- opt )
514
- MPILIBDIR="/release"
515
- ;;
516
- opt_mt )
517
- MPILIBDIR="/release"
518
- MPILIBDIR_MT="mt"
519
- ;;
520
- dbg )
521
- MPILIBDIR="/debug"
522
- ;;
523
- dbg_mt )
524
- MPILIBDIR="/debug"
525
- MPILIBDIR_MT="mt"
526
- ;;
527
- * )
528
- echo "Warning: incorrect library version specified. Automatically selected library will be used."
529
- ;;
522
+ opt )
523
+ MPILIBDIR=${release_lib_dir}
524
+ ;;
525
+ opt_mt )
526
+ MPILIBDIR=${release_lib_dir}
527
+ ;;
528
+ dbg )
529
+ MPILIBDIR=${debug_lib_dir}
530
+ ;;
531
+ dbg_mt )
532
+ MPILIBDIR=${debug_lib_dir}
533
+ ;;
534
+ * )
535
+ echo "Warning: incorrect library version specified. Automatically selected library will be used."
536
+ ;;
530
537
  esac
531
538
  fi
532
-
533
539
  # -----------------------------------------------------------------------
534
- case "$MPILIBDIR" in
535
- release | /release | debug | /debug)
536
- if [ ! -z "$MPILIBDIR_MT" ]; then
537
- MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
538
- fi
539
- ;;
540
- "" )
541
- MPILIBDIR=/release
542
- ;;
543
- esac
540
+
544
541
  if [ "$static_mpi" = yes ] ; then
545
542
  if [ "x$fortran_binding" = "x" ]; then
546
543
  mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
{impi_devel-2021.10.0.data → impi_devel-2021.12.0.data}/data/bin/mpigxx RENAMED
@@ -95,8 +95,8 @@
95
95
  # Directory locations: Fixed for any MPI implementation
96
96
  prefix=I_MPI_SUBSTITUTE_INSTALLDIR
97
97
  # The environment variable I_MPI_ROOT may be used to override installation folder path
98
- if [ -n "$I_MPI_ROOT" ] ; then
99
- prefix=$I_MPI_ROOT;
98
+ if [ -n "${I_MPI_ROOT}" ] ; then
99
+ prefix="${I_MPI_ROOT}";
100
100
  fi
101
101
 
102
102
  exec_prefix=__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__
@@ -104,6 +104,15 @@ sysconfdir=${prefix}/etc
104
104
  includedir=${prefix}/include
105
105
  libdir=${prefix}/lib
106
106
 
107
+ if [ ! -f "${prefix}/lib/mpi/debug/libmpi.so" ]; then
108
+ release_lib_dir="/release"
109
+ debug_lib_dir="/debug"
110
+ else
111
+ sysconfdir=${prefix}/opt/mpi/etc
112
+ release_lib_dir=""
113
+ debug_lib_dir="/mpi/debug"
114
+ fi
115
+ MPILIBDIR=${release_lib_dir}
107
116
  # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
108
117
  # folder where *.conf files are placed
109
118
  if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
@@ -114,7 +123,7 @@ fi
114
123
  CXX="g++"
115
124
  MPICH_VERSION="3.4a2"
116
125
  CXXFLAGS=""
117
- MPIVERSION="2021.10"
126
+ MPIVERSION="2021.12"
118
127
  MPILIBNAME="mpi"
119
128
  MPICXXLIBNAME="mpicxx"
120
129
 
@@ -414,7 +423,7 @@ for arg in "$@" ; do
414
423
  addarg=no
415
424
  ;;
416
425
  -g)
417
- MPILIBDIR="/release"
426
+ MPILIBDIR=${release_lib_dir}
418
427
  ;;
419
428
  -static_log)
420
429
  static_log=yes
@@ -512,37 +521,23 @@ fi
512
521
 
513
522
  if [ -n "$mpilib_override" ] ; then
514
523
  case "$mpilib_override" in
515
- opt )
516
- MPILIBDIR="/release"
517
- ;;
518
- opt_mt )
519
- MPILIBDIR="/release"
520
- MPILIBDIR_MT="mt"
521
- ;;
522
- dbg )
523
- MPILIBDIR="/debug"
524
- ;;
525
- dbg_mt )
526
- MPILIBDIR="/debug"
527
- MPILIBDIR_MT="mt"
528
- ;;
529
- * )
530
- echo "Warning: incorrect library version specified. Automatically selected library will be used."
531
- ;;
524
+ opt )
525
+ MPILIBDIR=${release_lib_dir}
526
+ ;;
527
+ opt_mt )
528
+ MPILIBDIR=${release_lib_dir}
529
+ ;;
530
+ dbg )
531
+ MPILIBDIR=${debug_lib_dir}
532
+ ;;
533
+ dbg_mt )
534
+ MPILIBDIR=${debug_lib_dir}
535
+ ;;
536
+ * )
537
+ echo "Warning: incorrect library version specified. Automatically selected library will be used."
538
+ ;;
532
539
  esac
533
540
  fi
534
-
535
- # -----------------------------------------------------------------------
536
- case "$MPILIBDIR" in
537
- release | /release | debug | /debug)
538
- if [ ! -z "$MPILIBDIR_MT" ]; then
539
- MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
540
- fi
541
- ;;
542
- "" )
543
- MPILIBDIR=/release
544
- ;;
545
- esac
546
541
  # -----------------------------------------------------------------------
547
542
  if [ "$static_mpi" = yes ] ; then
548
543
  if [ "x$fortran_binding" = "x" ]; then