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

some additional changes that were made to the code yesterday.

Просмотр исходного кода 
This commit was SVN r3467.
Этот коммит содержится в:
Prabhanjan Kambadur 2004-11-02 13:14:34 +00:00
родитель e944f3d9c5
Коммит 4c8c62204d
25 изменённых файлов: 502 добавлений и 107 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
src/mca/allocator/base/allocator_base_open.c
Просмотреть файл

@ -18,11 +18,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_allocator_base_static_components[] = {NULL};
#else
#include "mca/allocator/base/static-components.h"
#endif
/*
* Global variables

5
src/mca/gpr/base/gpr_base_open.c
Просмотреть файл

@ -20,12 +20,7 @@
* component's public mca_base_module_t struct.
*/
#ifndef WIN32
/*FIXME*/
#include "mca/gpr/base/static-components.h"
#else
mca_gpr_base_static_components = NULL;
#endif
/*
* globals

4
src/mca/llm/base/llm_base_open.c
Просмотреть файл

@ -18,11 +18,7 @@
* module's public mca_base_module_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_llm_base_static_components[] = {NULL};
#else
#include "mca/llm/base/static-components.h"
#endif
/*
* Global variables

4
src/mca/ns/base/ns_base_open.c
Просмотреть файл

@ -19,11 +19,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_ns_base_static_components[] = {NULL};
#else
#include "mca/ns/base/static-components.h"
#endif
/*
* globals

4
src/mca/oob/base/oob_base_open.c
Просмотреть файл

@ -16,11 +16,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_oob_base_static_components[] = {NULL};
#else
#include "mca/oob/base/static-components.h"
#endif
/*

13
src/mca/oob/tcp/oob_tcp.c
Просмотреть файл

@ -145,6 +145,14 @@ static inline char* mca_oob_tcp_param_register_str(
*/
int mca_oob_tcp_component_open(void)
{
#ifdef WIN32
WSADATA win_sock_data;
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
ompi_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: error %d\n", WSAGetLastError());
return OMPI_ERROR;
}
#endif
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_subscriptions, ompi_list_t);
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_list, ompi_list_t);
OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_tree, ompi_rb_tree_t);
@ -179,6 +187,10 @@ int mca_oob_tcp_component_open(void)
int mca_oob_tcp_component_close(void)
{
#ifdef WIN32
WSACleanup();
#endif
/* cleanup resources */
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peer_list);
OBJ_DESTRUCT(&mca_oob_tcp_component.tcp_peer_tree);
@ -391,6 +403,7 @@ mca_oob_t* mca_oob_tcp_component_init(int* priority, bool *allow_multi_user_thre
*allow_multi_user_threads = true;
*have_hidden_threads = OMPI_HAVE_THREADS;
/* are there any interfaces? */
if(ompi_ifcount() == 0)
return NULL;

4
src/mca/pcmclient/base/pcmclient_base_open.c
Просмотреть файл

@ -15,11 +15,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_pcmclient_base_static_components[] = {NULL};
#else
#include "mca/pcmclient/base/static-components.h"
#endif
/*

4
src/mca/pml/base/pml_base_open.c
Просмотреть файл

@ -18,11 +18,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_pml_base_static_components[] = {NULL};
#else
#include "mca/pml/base/static-components.h"
#endif
static int mca_pml_base_progress(void)
{

10
src/mca/pml/teg/src/pml_teg_component.c
Просмотреть файл

@ -61,6 +61,13 @@ static inline int mca_pml_teg_param_register_int(
int mca_pml_teg_component_open(void)
{
#ifdef WIN32
WSADATA win_sock_data;
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
ompi_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: %d\n", WSAGetLastError());
return OMPI_ERROR;
}
#endif
OBJ_CONSTRUCT(&mca_pml_teg.teg_lock, ompi_mutex_t);
OBJ_CONSTRUCT(&mca_pml_teg.teg_send_requests, ompi_free_list_t);
OBJ_CONSTRUCT(&mca_pml_teg.teg_recv_requests, ompi_free_list_t);
@ -88,6 +95,9 @@ int mca_pml_teg_component_open(void)
int mca_pml_teg_component_close(void)
{
#ifdef WIN32
WSACleanup();
#endif
#if MCA_PML_TEG_STATISTICS && OMPI_ENABLE_DEBUG
ompi_output(0, "mca_pml_teg.teg_sends = %d\n",
mca_pml_teg.teg_sends);

4
src/mca/ptl/base/ptl_base_open.c
Просмотреть файл

@ -19,11 +19,7 @@
* component's public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_ptl_base_static_components[] = {NULL};
#else
#include "mca/ptl/base/static-components.h"
#endif
/*

11
src/mca/ptl/tcp/src/ptl_tcp_component.c
Просмотреть файл

@ -145,6 +145,14 @@ static inline int mca_ptl_tcp_param_register_int(
int mca_ptl_tcp_component_open(void)
{
#ifdef WIN32
WSADATA win_sock_data;
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
ompi_output (0, "mca_ptl_tcp_component_init: failed to initialise windows sockets:%d\n", WSAGetLastError());
return OMPI_ERROR;
}
#endif
/* initialize state */
mca_ptl_tcp_component.tcp_listen_sd = -1;
mca_ptl_tcp_component.tcp_ptl_modules = NULL;
@ -200,6 +208,9 @@ int mca_ptl_tcp_component_open(void)
int mca_ptl_tcp_component_close(void)
{
ompi_list_item_t* item;
#ifdef WIN32
WSACleanup();
#endif
if (mca_ptl_tcp_component.tcp_send_frags.fl_num_allocated !=
mca_ptl_tcp_component.tcp_send_frags.super.ompi_list_length) {
ompi_output(0, "tcp send frags: %d allocated %d returned\n",

4
src/mca/topo/base/topo_base_open.c
Просмотреть файл

@ -16,11 +16,7 @@
* statements and the definition of an array of pointers to each component's
* public mca_base_component_t struct.
*/
#ifdef WIN32
const mca_base_component_t *mca_topo_base_static_components[] = {NULL};
#else
#include "mca/topo/base/static-components.h"
#endif
/*
* Global variables

2
src/tools/mpirun/mpirun.c
Просмотреть файл

@ -59,7 +59,7 @@ main(int argc, char *argv[])
*/
cmd_line = OBJ_NEW(ompi_cmd_line_t);
if (OMPI_SUCCESS != ompi_init(argc, argv)) {
if (OMPI_SUCCESS != (ret = ompi_init(argc, argv))) {
/* BWB show_help */
printf("show_help: ompi_init failed\n");
return ret;

18
src/tools/win_makefile
Просмотреть файл

@ -32,14 +32,14 @@ INCL = \
CFLAGS = \
/DWIN32 \
/DOMPI_SYSCONFDIR="\"${prefix}/share\"" \
/nologo \
/c
/nologo
CPPFLAGS = \
/DWIN32 \
/DOMPI_SYSCONFDIR="\"${prefix}/share\"" \
/c \
/TP \
/Zi \
/nologo \
/EHsc
@ -72,7 +72,7 @@ ADD_INCL = \
# link with ompi.lib to resolve external symbols
OMPILIB = \
"${topdir}/vcproj/ompi/Debug/ompi.lib"
"${topdir}/src/libmpi.lib"
LINK = link
@ -81,23 +81,19 @@ LINKFLAGS = \
/DEFAULTLIB:${OMPILIB}
all: \
clibs \
cpplibs
cexes
clibs: ${C_SUBDIRS}
cexes: ${C_SUBDIRS}
@for dirs in ${C_SUBDIRS}; do \
(echo "Entering $$dirs"; cd $$dirs; ${CC} ${CFLAGS} ${INCL} *.c; ${LINK} ${LINKFLAGS} *.obj); \
(echo "Entering $$dirs"; cd $$dirs; ${CC} ${CFLAGS} ${INCL} *.c ${OMPILIB};); \
done
cpplibs: ${CPP_SUBDIRS}
@for dirs in ${CPP_SUBDIRS}; do \
(echo "Entering $$dirs"; cd $$dirs; ${CC} ${CPPFLAGS} ${INCL} ${ADD_INCL} *.cc; ${LINK} ${LINKFLAGS} *.obj); \
(echo "Entering $$dirs"; cd $$dirs; ${CC} ${CPPFLAGS} ${INCL} ${ADD_INCL} *.cc ${OMPILIB};); \
done
install:
@for dirs in ${CPP_SUBDIRS}; do \
(${CC} ${CPPFLAGS} ${INCL} ${ADD_INCL} *.cc; ${LINK} ${LINKFLAGS} *.obj); \
done
.PHONY: clean

10
src/util/if.c
Просмотреть файл

@ -196,7 +196,6 @@ static int ompi_ifinit(void)
#define MAX_INTERFACES 10 /* Anju: for now assume there are no more than this */
int ret;
WSADATA win_sock_data;
SOCKET sd;
INTERFACE_INFO if_list[MAX_INTERFACES];
int num_interfaces;
@ -212,12 +211,6 @@ static int ompi_ifinit(void)
return OMPI_SUCCESS;
}
/* else initialise the use of Winsock2.DLL */
if (WSAStartup (MAKEWORD (2, 2), &win_sock_data) != 0) {
ompi_output(0, "ompi_ifinit: WSAStartup failed with errno=%d\n",WSAGetLastError());
return OMPI_ERROR;
}
/* create a socket */
sd = WSASocket (AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0);
if (sd == SOCKET_ERROR) {
@ -288,9 +281,6 @@ static int ompi_ifinit(void)
}
}
/* this takes care of the cleanup for us :-D */
WSACleanup ();
#endif
return OMPI_SUCCESS;
}

6
src/util/malloc.h
Просмотреть файл

@ -118,9 +118,6 @@ void *ompi_realloc(void *ptr, size_t size, char *file, int line);
* checkout).
*/
void ompi_free(void *addr, char *file, int line);
#if defined(c_plusplus) || defined(__cplusplus)
}
#endif
OMPI_DECLSPEC extern int ompi_malloc_debug_level;
OMPI_DECLSPEC extern int ompi_malloc_output;
@ -139,5 +136,8 @@ static inline void ompi_malloc_debug(int level)
{
ompi_malloc_debug_level = level;
}
#if defined(c_plusplus) || defined(__cplusplus)
}
#endif
#endif /* OMPI_MALLOC_H */

2
src/util/sys_info.c
Просмотреть файл

@ -46,7 +46,7 @@ int ompi_sys_info(void)
#define INFO_BUF_SIZE 32768
TCHAR info_buf[INFO_BUF_SIZE];
DWORD info_buf_length = INFO_BUF_SIZE;
char sep[] = "\\0";
char *sep = "\\";
#endif
if (ompi_system_info.init) {

9
src/win32/ompi_misc.h
Просмотреть файл

@ -7,6 +7,15 @@ $HEADER$
#define _SC_PAGESIZE 0
static __inline char* getenv (const char *name) {
/* currently, this is a memory leak */
int ret;
char *buffer = (char *)malloc(sizeof(char) * 100);
ret = GetEnvironmentVariable(name, buffer, 100);
return (ret > 0) ? buffer: NULL;
}
static __inline int setenv (const char *name, const char *value, int rewrite) {
/* just push it back to the windows thingy */

28
src/win32/ompi_util.h
Просмотреть файл

@ -5,6 +5,8 @@
#ifndef OMPI_UTIL_H
#define OMPI_UTIL_H
#include <string.h>
static __inline int getpagesize(void) {
SYSTEM_INFO sys_info;
@ -12,19 +14,33 @@ static __inline int getpagesize(void) {
return (int)sys_info.dwPageSize;
}
static __inline char *basename(char *path) {
char *p = path;
char *ret;
while (*p != '\0') p++;
while (*p != '\\') p--;
ret = strdup(++p);
return ret;
}
static __inline char *dirname(char *path) {
/* remember, this is the windows version, so path is bound to contain
the drive letter. Although, we are merely concerned with removing
the last \ from the path offered. A new string should be allocated?? */
char *dirname;
char *base;
base = basename(path);
dirname = strdup(path);
strncpy(dirname, path, strlen(path)-strlen(base));
dirname[strlen(path)-strlen(base)] = '\0';
return NULL;
}
static __inline char *basename(char *path) {
return NULL;
return dirname;
}
static __inline int strncasecmp (char *s1, char *s2, int n) {

1
src/win32/win_compat.h
Просмотреть файл

@ -31,7 +31,6 @@
#include <ws2tcpip.h>
#include <process.h>
#include <io.h>
#include "win32/ompi_declspec.h"
#include "win32/ompi_uio.h"
#include "win32/ompi_time.h"
#include "win32/ompi_utsname.h"

49
src/win_makefile
Просмотреть файл

@ -49,7 +49,38 @@ C_SUBDIRS = \
mca/topo/base \
win32/generated_source \
win \
win32
win32 \
mca/allocator/bucket \
mca/coll/basic \
mca/llm/hostfile/src \
mca/ns/proxy/src \
mca/gpr/proxy/ \
mca/pcmclient/env \
mca/pcmclient/seed \
mca/pcmclient/singleton \
mca/topo/unity/src \
mca/ptl/tcp/src \
mca/oob/tcp/ \
mca/pml/teg/src \
mca/ns/replica/src \
mca/gpr/replica/
EXTRA_DIRS = \
STATIC_LIBS = \
allocator \
coll\
llm\
ns\
gpr \
pcmclient\
topo\
ptl\
oob\
pml\
ns\
gpr
#
# A small function to extract the list of all files in these directories
@ -69,22 +100,23 @@ INCL = \
CFLAGS = \
/DWIN32 \
/DOMPI_BUILDING=1 \
/DOMPI_SYSCONFDIR="\"${sysconfdir}\"" \
/DOMPI_PKGLIBDIR="\"${pkglibdir}\"" \
/DOMPI_PKGDATADIR="\"${pkgdatadir}\"" \
/DHAVE_CONFIG_H \
/DOMPI_BUILDING_LIBRARY \
/D_WINDLL \
/EHsc \
/MLd \
/W0 \
/Wp64 \
/ZI \
/Zi \
/TC \
/D_MBCS \
/Gm \
/Od \
/LD \
/LDd \
/Fo"${topdir}/src/Debug/" \
/nologo \
/c
@ -124,6 +156,12 @@ prebuild:
@echo "Creating show_help_lex.c"
@/usr/bin/flex -t -Pompi_show_help_yy "${topdir}/src/util/show_help_lex.l" \
> "${topdir}/src/util/show_help_lex.c" 2>/dev/null
@echo -n "Copying static-components.h to the right directories ......"
@for dirs in ${STATIC_LIBS}; do \
(dir=mca/$${dirs}/base; comp_name=$${dirs}_static-components.h; cp ${topdir}/src/win32/generated_include/$${comp_name} $${dir}/static-components.h;); \
done
@echo "done"
clibs: prebuild ${FILES}
@for dirs in ${C_SUBDIRS}; do \
@ -134,7 +172,7 @@ libmpi:
${LINK} ${LINKFLAGS} ${ADDLIBS} Debug/*.obj
install:
@echo "Installing libmpi and include file ................"
@echo -n "Installing libmpi and include file ................"
@install -c ${topdir}/src/libmpi.lib ${install-dir}/lib/libmpi.lib
@install -c ${topdir}/src/libmpi.exp ${install-dir}/lib/libmpi.exp
@install -c ${topdir}/src/libmpi.dll ${install-dir}/lib/libmpi.dll
@ -144,7 +182,8 @@ install:
${install-dir}/include/ompi_config.h
@install -c ${topdir}/include/mpi.h ${install-dir}/include/mpi.h
@install -c ${topdir}/include/ompi_stdint.h ${install-dir}/include/ompi_stdint.h
@install -c ${topdir}/src/win32/win_compat.h/ ${install-dir}/include/win32/win_compat.h
@install -c ${topdir}/src/win32/win_compat.h ${install-dir}/include/win32/win_compat.h
@echo "done"
.PHONY: clean

2
vcproj/ompi/ompi.sln
Просмотреть файл

@ -85,9 +85,11 @@ Global
{7424D14E-7523-4BC7-A4A8-5509C2F51D01}.Release.ActiveCfg = Release|Win32
{7424D14E-7523-4BC7-A4A8-5509C2F51D01}.Release.Build.0 = Release|Win32
{D6F8183F-75BE-4F15-86E9-CC6C96E0B44B}.Debug.ActiveCfg = Debug|Win32
{D6F8183F-75BE-4F15-86E9-CC6C96E0B44B}.Debug.Build.0 = Debug|Win32
{D6F8183F-75BE-4F15-86E9-CC6C96E0B44B}.Release.ActiveCfg = Release|Win32
{D6F8183F-75BE-4F15-86E9-CC6C96E0B44B}.Release.Build.0 = Release|Win32
{00041BD4-5225-4A91-9FD1-CF0F2B32AB4C}.Debug.ActiveCfg = Debug|Win32
{00041BD4-5225-4A91-9FD1-CF0F2B32AB4C}.Debug.Build.0 = Debug|Win32
{00041BD4-5225-4A91-9FD1-CF0F2B32AB4C}.Release.ActiveCfg = Release|Win32
{00041BD4-5225-4A91-9FD1-CF0F2B32AB4C}.Release.Build.0 = Release|Win32
EndGlobalSection

389
vcproj/ompi/ompi.vcproj
Просмотреть файл

@ -18,7 +18,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/I&quot;../generated_include&quot; /I&quot;../../src/win32/generated_include&quot; /I&quot;../../include&quot; /I&quot;../../src&quot; /D&quot;__i386__&quot; /D&quot;HAVE_CONFIG_H&quot; /D&quot;OMPI_PKGDATADIR&quot; /D&quot;OMPI_PKGLIBDIR&quot; /D&quot;OMPI_SYSCONFDIR&quot; /DOMPI_BUILDING_LIBRARY "
AdditionalOptions="/I&quot;../generated_include&quot; /I&quot;../../src/win32/generated_include&quot; /I&quot;../../include&quot; /I&quot;../../src&quot; /I&quot;../../src/event/compat/&quot; /I&quot;../../src/event/WIN32-Code&quot; /D&quot;__i386__&quot; /D&quot;HAVE_CONFIG_H&quot; /DOMPI_PKGDATADIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_PKGLIBDIR=&quot;\&quot;C:/cygwin/ompi-new/vcpro/ompi/Debug\&quot;&quot; /DOMPI_SYSCONFDIR=&quot;\&quot;C:/cygwin/ompi-new/vcproj/ompi/Debug\&quot;&quot; /DOMPI_BUILDING"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
GeneratePreprocessedFile="0"
@ -124,6 +124,9 @@
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\util\show_help_lex.c">
</File>
<Filter
Name="src"
Filter="">
@ -185,6 +188,12 @@
<File
RelativePath="..\..\src\class\ompi_pointer_array.h">
</File>
<File
RelativePath="..\..\src\class\ompi_proc_table.c">
</File>
<File
RelativePath="..\..\src\class\ompi_proc_table.h">
</File>
<File
RelativePath="..\..\src\class\ompi_rb_tree.c">
</File>
@ -290,7 +299,7 @@
RelativePath="..\..\src\mca\base\mca_base_parse_paramfile.c">
</File>
<File
RelativePath="..\..\src\win32\generated_source\mca_base_parse_paramfile_lex.c">
RelativePath="..\..\src\mca\base\mca_base_parse_paramfile_lex.c">
</File>
<File
RelativePath="..\..\src\win32\generated_source\mca_base_parse_paramfile_lex.h">
@ -408,9 +417,6 @@
<File
RelativePath="..\..\src\mca\llm\base\llm_base_parse_hostfile.c">
</File>
<File
RelativePath="..\..\src\win32\generated_source\llm_base_parse_hostfile_lex.c">
</File>
<File
RelativePath="..\..\src\mca\llm\base\llm_base_parse_hostfile_lex.h">
</File>
@ -420,6 +426,9 @@
<File
RelativePath="..\..\src\mca\llm\base\llm_base_util.c">
</File>
<File
RelativePath="..\..\src\mca\llm\base\mca_llm_base_parse_hostfile_lex.c">
</File>
</Filter>
</Filter>
<Filter
@ -549,6 +558,9 @@
<File
RelativePath="..\..\src\mca\pcm\base\base_job_track.h">
</File>
<File
RelativePath="..\..\src\mca\pcm\base\base_kill_track.h">
</File>
<File
RelativePath="..\..\src\mca\pcm\base\pcm_base_close.c">
</File>
@ -556,10 +568,10 @@
RelativePath="..\..\src\mca\pcm\base\pcm_base_comm.c">
</File>
<File
RelativePath="..\..\src\mca\pcm\base\pcm_base_ioexecvp.c">
RelativePath="..\..\src\mca\pcm\base\pcm_base_job_track.c">
</File>
<File
RelativePath="..\..\src\mca\pcm\base\pcm_base_job_track.c">
RelativePath="..\..\src\mca\pcm\base\pcm_base_kill_track.c">
</File>
<File
RelativePath="..\..\src\mca\pcm\base\pcm_base_open.c">
@ -763,6 +775,41 @@
</File>
</Filter>
</Filter>
<Filter
Name="io"
Filter="">
<File
RelativePath="..\..\src\mca\io\io.h">
</File>
<Filter
Name="base"
Filter="">
<File
RelativePath="..\..\src\mca\io\base\base.h">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_close.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_delete.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_file_select.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_find_available.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_open.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_request.c">
</File>
<File
RelativePath="..\..\src\mca\io\base\io_base_request.h">
</File>
</Filter>
</Filter>
</Filter>
<Filter
Name="datatype"
@ -1957,6 +2004,9 @@
<File
RelativePath="..\..\src\mpi\runtime\mpiruntime.h">
</File>
<File
RelativePath="..\..\src\mpi\runtime\ompi_mpi_abort.c">
</File>
<File
RelativePath="..\..\src\mpi\runtime\ompi_mpi_finalize.c">
</File>
@ -2297,9 +2347,6 @@
<File
RelativePath="..\..\src\util\proc_info.h">
</File>
<File
RelativePath="..\..\src\util\pty.c">
</File>
<File
RelativePath="..\..\src\util\session_dir.c">
</File>
@ -2312,9 +2359,6 @@
<File
RelativePath="..\..\src\util\show_help.h">
</File>
<File
RelativePath="..\..\src\win32\generated_source\show_help_lex.c">
</File>
<File
RelativePath="..\..\src\util\show_help_lex.h">
</File>
@ -2405,6 +2449,325 @@
RelativePath="..\..\include\ompi_stdint.h">
</File>
</Filter>
<Filter
Name="components"
Filter="">
<File
RelativePath="..\..\src\mca\allocator\bucket\allocator_bucket.c">
</File>
<File
RelativePath="..\..\src\mca\allocator\bucket\allocator_bucket_alloc.c">
</File>
<File
RelativePath="..\..\src\mca\allocator\bucket\allocator_bucket_alloc.h">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll-basic-version.h">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic.h">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_allgather.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_allgatherv.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_allreduce.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_alltoall.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_alltoallv.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_alltoallw.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_barrier.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_bcast.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_component.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_exscan.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_gather.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_gatherv.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_reduce.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_reduce_scatter.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_scan.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_scatter.c">
</File>
<File
RelativePath="..\..\src\mca\coll\basic\coll_basic_scatterv.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\proxy\gpr_proxy.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\proxy\gpr_proxy.h">
</File>
<File
RelativePath="..\..\src\mca\gpr\proxy\gpr_proxy_component.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\replica\gpr_replica.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\replica\gpr_replica.h">
</File>
<File
RelativePath="..\..\src\mca\gpr\replica\gpr_replica_component.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\replica\gpr_replica_internals.c">
</File>
<File
RelativePath="..\..\src\mca\gpr\replica\gpr_replica_internals.h">
</File>
<File
RelativePath="..\..\src\mca\llm\hostfile\src\llm_hostfile.h">
</File>
<File
RelativePath="..\..\src\mca\llm\hostfile\src\llm_hostfile_allocate.c">
</File>
<File
RelativePath="..\..\src\mca\llm\hostfile\src\llm_hostfile_component.c">
</File>
<File
RelativePath="..\..\src\mca\llm\hostfile\src\llm_hostfile_deallocate.c">
</File>
<File
RelativePath="..\..\src\mca\ns\proxy\src\ns_proxy.c">
</File>
<File
RelativePath="..\..\src\mca\ns\proxy\src\ns_proxy.h">
</File>
<File
RelativePath="..\..\src\mca\ns\proxy\src\ns_proxy_component.c">
</File>
<File
RelativePath="..\..\src\mca\ns\replica\src\ns_replica.c">
</File>
<File
RelativePath="..\..\src\mca\ns\replica\src\ns_replica.h">
</File>
<File
RelativePath="..\..\src\mca\ns\replica\src\ns_replica_component.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp.h">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_addr.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_addr.h">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_hdr.h">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_msg.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_msg.h">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_peer.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_peer.h">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_ping.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_recv.c">
</File>
<File
RelativePath="..\..\src\mca\oob\tcp\oob_tcp_send.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\env\pcmclient-env-version.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\seed\pcmclient-seed-version.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\singleton\pcmclient-singleton-version.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\env\pcmclient_env.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\env\pcmclient_env.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\env\pcmclient_env_component.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\seed\pcmclient_seed.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\seed\pcmclient_seed.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\seed\pcmclient_seed_component.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\singleton\pcmclient_singleton.c">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\singleton\pcmclient_singleton.h">
</File>
<File
RelativePath="..\..\src\mca\pcmclient\singleton\pcmclient_singleton_component.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_ptl_array.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_ptl_array.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_cancel.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_component.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_iprobe.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_irecv.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_isend.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_proc.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_proc.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_progress.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_ptl.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_ptl.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_recvfrag.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_recvfrag.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_recvreq.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_recvreq.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_sendreq.c">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_sendreq.h">
</File>
<File
RelativePath="..\..\src\mca\pml\teg\src\pml_teg_start.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_addr.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_component.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_peer.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_peer.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_proc.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_proc.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_recvfrag.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_recvfrag.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_sendfrag.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_sendfrag.h">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_sendreq.c">
</File>
<File
RelativePath="..\..\src\mca\ptl\tcp\src\ptl_tcp_sendreq.h">
</File>
<File
RelativePath="..\..\src\mca\topo\unity\src\topo_unity.c">
</File>
<File
RelativePath="..\..\src\mca\topo\unity\src\topo_unity.h">
</File>
<File
RelativePath="..\..\src\mca\topo\unity\src\topo_unity_cart_map.c">
</File>
<File
RelativePath="..\..\src\mca\topo\unity\src\topo_unity_component.c">
</File>
<File
RelativePath="..\..\src\mca\topo\unity\src\topo_unity_graph_map.c">
</File>
</Filter>
</Filter>
<File
RelativePath=".\ReadMe.txt">

16
vcproj/ompid/ompid.vcproj
Просмотреть файл

@ -18,6 +18,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/I&quot;../../src/win32/generated_include/&quot; /I&quot;../../src&quot; /I&quot;../../include&quot;"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
@ -118,21 +119,6 @@
<File
RelativePath="..\..\src\tools\ompid\ompid.c">
</File>
<File
RelativePath="..\..\src\tools\ompid\ompid.cc">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tools\ompid\ompid.h">
</File>

6
vcproj/openmpi/openmpi.vcproj
Просмотреть файл

@ -18,8 +18,9 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/I&quot;../../src/win32/generated_include&quot; /I&quot;../../include&quot; /DOMPI_WINDOWS"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions="_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
@ -118,9 +119,6 @@
<File
RelativePath="..\..\src\tools\openmpi\openmpi.c">
</File>
<File
RelativePath="..\..\src\tools\openmpi\openmpi.h">
</File>
</Filter>
</Files>
<Globals>