prov/sockets: Remove provider

Sockets provider is only supported in the v1.x series

Signed-off-by: Sean Hefty <[email protected]>

Makefile.am

@@ -448,7 +448,6 @@ prov_dist_man_pages=
 prov_extra_dist=
 EXTRA_DIST=
 
-include prov/sockets/Makefile.include
 include prov/udp/Makefile.include
 include prov/verbs/Makefile.include
 include prov/efa/Makefile.include

configure.ac

@@ -947,7 +947,6 @@ dnl Provider-specific checks
 FI_PROVIDER_INIT
 FI_PROVIDER_SETUP([psm2])
 FI_PROVIDER_SETUP([psm3])
-FI_PROVIDER_SETUP([sockets])
 FI_PROVIDER_SETUP([verbs])
 FI_PROVIDER_SETUP([efa])
 FI_PROVIDER_SETUP([udp])

contrib/intel/jenkins/Jenkinsfile

@@ -17,7 +17,7 @@ def run_python(version, command, output=null) {
 }
 
 def slurm_batch(partition, node_num, output, command) {
-  
+
   try {
     sh """timeout $TIMEOUT sbatch --partition=${partition} -N ${node_num} \
           --wait -o ${output} --open-mode=append --wrap=\'env; ${command}\'
@@ -66,7 +66,7 @@ def run_middleware(providers, stage_name, test, partition, node_num, mpi=null,
 
   if (env.WEEKLY.toBoolean())
     base_cmd = "${base_cmd} --weekly=${env.WEEKLY}"
-    
+
   for (prov in providers) {
     if (prov[1]) {
       echo "Running ${prov[0]}-${prov[1]} ${stage_name}"
@@ -254,8 +254,8 @@ pipeline {
             weekly = env.WEEKLY.toBoolean()
           }
           if (weekly) {
-            TIMEOUT="21600" 
-          } 
+            TIMEOUT="21600"
+          }
           skip = skip()
           RELEASE = release()
           if (skip && !weekly) {
@@ -267,7 +267,7 @@ pipeline {
     stage ('prepare build') {
       when { equals expected: true, actual: DO_RUN }
       steps {
-        script {  
+        script {
           echo "Copying build dirs."
           build("builddir")
           echo "Copying log dirs."
@@ -301,15 +301,10 @@ pipeline {
                 checkout scm
                 echo "Building Libfabric reg"
                 slurm_batch("squirtle,totodile", "1",
-                            "${env.LOG_DIR}/libfabric_mpich_log", 
+                            "${env.LOG_DIR}/libfabric_mpich_log",
                             """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \
                               --build_item=libfabric_mpich """
                           )
-                slurm_batch("squirtle,totodile", "1",
-                            "${env.LOG_DIR}/build_mpich_log", 
-                            """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \
-                              --build_item=mpich """
-                          ) 
               }
             }
           }
@@ -480,15 +475,6 @@ pipeline {
             }
           }
         }
-        stage('sockets') {
-          steps {
-            script {
-              dir (RUN_LOCATION) {
-                run_fabtests("sockets", "bulbasaur", "2", "sockets")
-              }
-            }
-          }
-        }
         stage('ucx') {
           steps {
             script {
@@ -529,8 +515,7 @@ pipeline {
           steps {
             script {
               dir (RUN_LOCATION) {
-                run_middleware([["verbs", null], ["tcp", null],
-                                ["sockets", null]], "SHMEM", "shmem",
+                run_middleware([["verbs", null], ["tcp", null]], "SHMEM", "shmem",
                                 "squirtle,totodile", "2")
               }
             }
@@ -574,7 +559,7 @@ pipeline {
               dir (RUN_LOCATION) {
                 run_middleware([["verbs", "rxm"]], "oneCCL-GPU-v3", "onecclgpu",
                                "fabrics-ci", "2")
-              } 
+              }
             }
           }
         }

contrib/intel/jenkins/common.py

@@ -102,7 +102,6 @@ def run(self):
    Prov('verbs', None),
    Prov('verbs', 'rxd'),
    Prov('verbs', 'rxm'),
-   Prov('sockets', None),
    Prov('tcp', None),
    Prov('udp', None),
    Prov('udp', 'rxd'),
@@ -112,7 +111,6 @@ def run(self):
 default_prov_list = [
     'verbs',
     'tcp',
-    'sockets',
     'udp',
     'shm',
     'psm3'

contrib/intel/jenkins/runtests.py

@@ -17,7 +17,7 @@ def __call__(self, parser, namespace, values, option_string=None):
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--prov', help="core provider", choices=['verbs', \
-                     'tcp', 'udp', 'sockets', 'shm', 'psm3', 'ucx'])
+                     'tcp', 'udp', 'shm', 'psm3', 'ucx'])
 parser.add_argument('--util', help="utility provider", choices=['rxd', 'rxm'])
 parser.add_argument('--ofi_build_mode', help="specify the build configuration",\
                     choices = ['reg', 'dbg', 'dl'], default='reg')

contrib/intel/jenkins/summary.py

@@ -537,7 +537,7 @@ def __init__(self, logger, log_dir, prov, mpi, file_name, stage_name):
 
         self.mpi = mpi
         self.run = 'mpiexec'
-    
+
     def read_file(self):
         with open(self.file_path,'r') as log_file:
             super().fast_forward(log_file)
@@ -551,7 +551,7 @@ def check_exclude(self, line):
             self.excluded_tests.append(test)
 
     def check_name(self, line):
-        if (line.startswith('ok') or 
+        if (line.startswith('ok') or
             line.startswith('not ok')):
                 self.name = line.split('-')[1].split('#')[0].strip()
 
@@ -696,7 +696,7 @@ def check_fail(self, line):
                 if 'cancel' in elem:
                     self.error += total
                     self.errored_tests.append(f'cancel: {self.test_name}')
-    
+
     def check_exclude(self, line):
         res_list = line.lstrip("results    :").rstrip().split('|')
         for elem in res_list:
@@ -867,7 +867,7 @@ def summarize_items(summary_item, logger, log_dir, mode):
         err += ret if ret else 0
 
     if summary_item == 'shmem' or summary_item == 'all':
-        for prov in ['tcp', 'verbs', 'sockets']:
+        for prov in ['tcp', 'verbs']:
             ret= ShmemSummarizer(
                 logger, log_dir, prov,
                 f'SHMEM_{prov}_shmem_{mode}',

contrib/intel/jenkins/tests.py

@@ -151,14 +151,6 @@ def options(self):
         else:
             opts += "-t all "
 
-        if (self.core_prov == 'sockets' and self.ofi_build_mode == 'reg'):
-            complex_test_file = f'{self.libfab_installpath}/share/fabtests/'\
-                                f'test_configs/{self.core_prov}/quick.test'
-            if (os.path.isfile(complex_test_file)):
-                opts += "-u {complex_test_file} "
-            else:
-                print(f"{self.core_prov} Complex test file not found")
-
         if (self.ofi_build_mode != 'reg' or self.core_prov == 'udp'):
             opts += "-e \'ubertest,multinode\' "
 
@@ -526,7 +518,7 @@ def env(self):
             cmd += f"export FI_PROVIDER={self.core_prov}\\;{self.util_prov}; "
         else:
             cmd += f"export FI_PROVIDER={self.core_prov}; "
-        if (self.core_prov == 'tcp'):    
+        if (self.core_prov == 'tcp'):
             cmd += "export FI_IFACE=eth0; "
         elif (self.core_prov == 'verbs'):
             cmd += "export FI_IFACE=ib0; "
@@ -770,7 +762,7 @@ def execute_cmd(self):
             if (self.weekly):
                 print(f'Weekly {self.mpi_type} mpichsuite tests')
                 os.chdir(self.mpichsuitepath)
-                common.run_command(shlex.split(self.mpi.env + 
+                common.run_command(shlex.split(self.mpi.env +
                                    configure_cmd + '\''))
                 self.exclude_tests(self.mpichsuitepath, self.core_prov)
                 testcmd = 'make testing'
@@ -782,7 +774,7 @@ def execute_cmd(self):
             else:
                 print(f"PR {self.mpi_type} mpichsuite tests")
                 os.chdir(self.mpichsuitepath)
-                common.run_command(shlex.split(self.mpi.env + 
+                common.run_command(shlex.split(self.mpi.env +
                                    configure_cmd + '\''))
                 common.run_command(['make', '-j'])
                 self.exclude_tests(self.mpichsuitepath, self.core_prov)
@@ -997,7 +989,7 @@ def __init__(self, jobname, buildno, testname, core_prov, fabric,
         print(core_prov)
         self.daos_nodes = cloudbees_config.prov_node_map[core_prov]
         print(self.daos_nodes)
-        self.launch_node = self.daos_nodes[0] 
+        self.launch_node = self.daos_nodes[0]
 
         self.cart_tests = {
                  'corpc_one_node'            :       {'tags' :'cart,corpc,one_node', 'numservers':1, 'numclients':0},
@@ -1030,12 +1022,12 @@ def set_paths(self, core_prov):
     @property
     def cmd(self):
         return "python3.6 launch.py "
-    
+
     def remote_launch_cmd(self, testname):
 
 #        The following env variables must be set appropriately prior
-#        to running the daos/cart tests OFI_DOMAIN, OFI_INTERFACE, 
-#        CRT_PHY_ADDR_STR, PATH, DAOS_TEST_SHARED_DIR DAOS_TEST_LOG_DIR, 
+#        to running the daos/cart tests OFI_DOMAIN, OFI_INTERFACE,
+#        CRT_PHY_ADDR_STR, PATH, DAOS_TEST_SHARED_DIR DAOS_TEST_LOG_DIR,
 #        LD_LIBRARY_PATH in the script being sourced below.
         launch_cmd = f"ssh {self.launch_node} \"source {self.ci_middlewares_path}/daos_ci_env_setup.sh && \
                            cd {self.cart_test_scripts} &&\" "

docs/windows.txt

@@ -9,7 +9,6 @@ Dependencies:
 Limitations:
 - Supported only 64-bit achitectures
 - Supported Windows Vista or newer Windows version
-- Supported 'sockets' provider only
 
 Build:
 - Open libfabric.sln file using Visual Studio

fabtests/Makefile.am

@@ -97,11 +97,6 @@ nobase_dist_config_DATA = \
         test_configs/lat_bw.test \
 	test_configs/tcp/all.test \
 	test_configs/tcp/tcp.exclude \
-        test_configs/sockets/all.test \
-        test_configs/sockets/quick.test \
-	test_configs/sockets/complete.test \
-	test_configs/sockets/verify.test \
-	test_configs/sockets/sockets.exclude \
         test_configs/udp/all.test \
         test_configs/udp/lat_bw.test \
         test_configs/udp/quick.test \
@@ -664,5 +659,5 @@ dist-hook: fabtests.spec
 	cp fabtests.spec $(distdir)
 
 test:
-	./scripts/runfabtests.sh -vvv -S $(os_excludes) -f ./test_configs/sockets/sockets.exclude sockets
+	./scripts/runfabtests.sh -vvv -S $(os_excludes) -f ./test_configs/tcp/tcp.exclude tcp
 	./scripts/runfabtests.sh -vvv -S $(os_excludes) -f ./test_configs/udp/udp.exclude udp

fabtests/common/shared.c

@@ -3079,7 +3079,7 @@ void ft_usage(char *name, char *desc)
 	ft_addr_usage();
 	FT_PRINT_OPTS_USAGE("-f <fabric>", "fabric name");
 	FT_PRINT_OPTS_USAGE("-d <domain>", "domain name");
-	FT_PRINT_OPTS_USAGE("-p <provider>", "specific provider name eg sockets, verbs");
+	FT_PRINT_OPTS_USAGE("-p <provider>", "specific provider name eg tcp, verbs");
 	FT_PRINT_OPTS_USAGE("-e <ep_type>", "Endpoint type: msg|rdm|dgram (default:rdm)");
 	FT_PRINT_OPTS_USAGE("", "Only the following tests support this option for now:");
 	FT_PRINT_OPTS_USAGE("", "fi_rma_bw");
@@ -3130,7 +3130,7 @@ void ft_mcusage(char *name, char *desc)
 	ft_addr_usage();
 	FT_PRINT_OPTS_USAGE("-f <fabric>", "fabric name");
 	FT_PRINT_OPTS_USAGE("-d <domain>", "domain name");
-	FT_PRINT_OPTS_USAGE("-p <provider>", "specific provider name eg sockets, verbs");
+	FT_PRINT_OPTS_USAGE("-p <provider>", "specific provider name eg tcp, verbs");
 	ft_hmem_usage();
 	FT_PRINT_OPTS_USAGE("-h", "display this help output");
 

fabtests/fabtests.vcxproj

@@ -276,7 +276,6 @@
   <ItemGroup>
     <None Include="test_configs\eq_cq.json" />
     <None Include="test_configs\lat_bw.json" />
-    <None Include="test_configs\sockets.json" />
     <None Include="test_configs\verbs.json" />
     <None Include="Makefile.win" />
   </ItemGroup>

fabtests/fabtests.vcxproj.filters

@@ -329,9 +329,6 @@
     <None Include="test_configs\lat_bw.json">
       <Filter>Source Files\test_configs</Filter>
     </None>
-    <None Include="test_configs\sockets.json">
-      <Filter>Source Files\test_configs</Filter>
-    </None>
     <None Include="test_configs\verbs.json">
       <Filter>Source Files\test_configs</Filter>
     </None>

fabtests/man/fabtests.7.md

@@ -593,7 +593,7 @@ in fabtests and reports the number of pass/fail/notrun.
 
 By default if none of the options are provided, it runs all the tests using
 
-	- sockets provider
+	- tcp provider
 	- 127.0.0.1 as both server and client address
 	- for small number of optiond and iterations
 

fabtests/scripts/runfabtests.cmd

@@ -621,7 +621,7 @@ goto :global_main
 	echo.  runfabtests.cmd [OPTIONS] [provider] [host] [client] 1>&2
 	echo. 1>&2
 	echo.Run fabtests using provider between host and client (default 1>&2
-	echo.'sockets' provider in loopback-mode).  Report pass/fail/notrun status. 1>&2
+	echo.'tcp' provider in loopback-mode).  Report pass/fail/notrun status. 1>&2
 	echo. 1>&2
 	echo.Options... 1>&2
 	echo.  -g       good IP address from [host]'s perspective (default %GOOD_ADDR%) 1>&2
@@ -737,7 +737,7 @@ goto :global_main
 	if "%GOOD_ADDR%" == "" set GOOD_ADDR=%S_INTERFACE%
 
 	if "%PROV%" == "" (
-		set PROV=sockets
+		set PROV=tcp
 		call :main "%TEST_TYPE%"
 	) else (
 		call :main "%TEST_TYPE%"

fabtests/scripts/runfabtests.sh

@@ -42,7 +42,7 @@
 trap cleanup_and_exit SIGINT
 
 #
-# Default behavior with no args will use sockets provider with loopback
+# Default behavior with no args will use tcp provider with loopback
 #
 declare BIN_PATH
 declare PROV=""
@@ -871,7 +871,7 @@ function usage {
 	errcho "  $0 [OPTIONS] [provider] [host] [client]"
 	errcho
 	errcho "Run fabtests using provider between host and client (default"
-	errcho "'sockets' provider in loopback-mode).  Report pass/fail/notrun status."
+	errcho "'tcp' provider in loopback-mode).  Report pass/fail/notrun status."
 	errcho
 	errcho "Options:"
 	errcho -e " -g\tgood IP address from <host>'s perspective (default $GOOD_ADDR)"