ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Update to reflect changes. Matches 1.7 branch now.

Просмотр исходного кода 
This commit was SVN r29638.
Этот коммит содержится в:
Rolf vandeVaart 2013-11-07 18:46:00 +00:00
родитель 01eef35dce
Коммит 60c6c624e8
1 изменённых файлов: 11 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
contrib/check-btl-sm-diffs.pl
Просмотреть файл

@ -130,21 +130,21 @@ foreach $smcudafile (@smcudafiles) {
if (!$showall_arg) { if (!$showall_arg) {
# First, remove all the #if-#else code. # First, remove all the #if-#else code.
# #ifdef OMPI_CUDA_SUPPORT # #ifdef OPAL_CUDA_SUPPORT
# ...stuff... # ...stuff...
# # else /* OMPI_CUDA_SUPPORT */ # # else /* OPAL_CUDA_SUPPORT */
# Then, remove all the #if-#endif code. # Then, remove all the #if-#endif code.
# #ifdef OMPI_CUDA_SUPPORT # #ifdef OPAL_CUDA_SUPPORT
# ...stuff... # ...stuff...
# #endif /* OMPI_CUDA_SUPPORT */ # #endif /* OPAL_CUDA_SUPPORT */
# Then, remove leftover #endif from the #if-#else. # Then, remove leftover #endif from the #if-#else.
# So, three pattern matching steps. # So, three pattern matching steps.
# Some notes about the regular expression. # Some notes about the regular expression.
# 1. Need the .*? so the #endif is matched with the closest if. # 1. Need the .*? so the #endif is matched with the closest if.
# 2. Added the comment OMPI_CUDA_SUPPORT on the #endif to get the right match. # 2. Added the comment OPAL_CUDA_SUPPORT on the #endif to get the right match.
# 3. Need the \n at the end to avoid leaving extra newlines. # 3. Need the \n at the end to avoid leaving extra newlines.
$contents =~ s/#if OMPI_CUDA_SUPPORT(.*?)((#else \/\* OMPI_CUDA_SUPPORT \*\/\n)|(#endif \/\* OMPI_CUDA_SUPPORT \*\/\n))//gis; $contents =~ s/#if OPAL_CUDA_SUPPORT(.*?)((#else \/\* OPAL_CUDA_SUPPORT \*\/\n)|(#endif \/\* OPAL_CUDA_SUPPORT \*\/\n))//gis;
$contents =~ s/#endif \/\* OMPI_CUDA_SUPPORT \*\/\n//gis; $contents =~ s/#endif \/\* OPAL_CUDA_SUPPORT \*\/\n//gis;
} }
# Strip off the copyright header also. # Strip off the copyright header also.
@ -180,19 +180,12 @@ foreach $smfile (@smfiles) {
$contents = Read($smfile); $contents = Read($smfile);
die("Couldn't Read $smfile!\n") if (!$contents); die("Couldn't Read $smfile!\n") if (!$contents);
$contents =~ s/\/\*(.*?)\$HEADER\$\n \*\/\n//is; $contents =~ s/\/\*(.*?)\$HEADER\$\n \*\/\n//is;
# Strip away KNEM as that is not in smcuda # Strip away KNEM as that is not in smcuda
$contents =~ s/#if OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA(.*?)((#else \/\* OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA \*\/\n)|(#endif \/\* OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA \*\/\n))//gis; $contents =~ s/#if OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA(.*?)((#else\n)|(#endif\n)|(#endif \/\* OMPI_BTL_SM_HAVE_KNEM || OMPI_BTL_SM_HAVE_CMA \*\/\n))//gis;
$contents =~ s/#if OMPI_BTL_SM_HAVE_KNEM(.*?)((#else\n)|(#endif\n)|(#endif \/\* OMPI_BTL_SM_HAVE_KNEM \*\/\n))//gis;
$contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA \*\/\n//gis;
$contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA \*\/\n//gis; $contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_KNEM \|\| OMPI_BTL_SM_HAVE_CMA \*\/\n//gis;
# Strip away KNEM as that is not in smcuda
$contents =~ s/#if OMPI_BTL_SM_HAVE_KNEM(.*?)((#else \/\* OMPI_BTL_SM_HAVE_KNEM \*\/\n)|(#endif \/\* OMPI_BTL_SM_HAVE_KNEM \*\/\n))//gis;
$contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_KNEM \*\/\n//gis; $contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_KNEM \*\/\n//gis;
# Strip away CMA as that is not in smcuda
$contents =~ s/#if OMPI_BTL_SM_HAVE_CMA(.*?)((#else \/\* OMPI_BTL_SM_HAVE_CMA \*\/\n)|(#endif \/\* OMPI_BTL_SM_HAVE_CMA \*\/\n))//gis;
$contents =~ s/#endif \/\* OMPI_BTL_SM_HAVE_CMA \*\/\n//gis;
Write($smfile, $contents); Write($smfile, $contents);
} }
if ($verbose_arg) { if ($verbose_arg) {