prov/tcp: Replace tcp with net code

The net provider began as a fork of the tcp provider in order to maintain tcp provider stability while optimizations were developed. Merge those optimizations back into the tcp provider by moving the net provider back as tcp. This change simply moves the files without any source code changes in an effort to help git follow and resolve future changes and conflicts. Signed-off-by: Stephen Oost <[email protected]> Signed-off-by: Sean Hefty <[email protected]>
pmem · Feb 10, 2023 · 5ce675a · 5ce675a
1 parent 568882d
commit 5ce675a
Show file tree

Hide file tree

Showing 35 changed files with 139 additions and 230 deletions.
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -30,7 +30,6 @@ env:
     --enable-rxm
     --enable-shm
     --enable-tcp
-    --enable-net
     --enable-udp
     --enable-usnic
     --enable-verbs=$PWD/rdma-core/build

diff --git a/Makefile.am b/Makefile.am
@@ -455,7 +455,7 @@ include prov/rxd/Makefile.include
 include prov/bgq/Makefile.include
 include prov/opx/Makefile.include
 include prov/shm/Makefile.include
-include prov/net/Makefile.include
+include prov/tcp/Makefile.include
 include prov/rstream/Makefile.include
 include prov/ucx/Makefile.include
 include prov/hook/Makefile.include

diff --git a/configure.ac b/configure.ac
@@ -912,7 +912,7 @@ dnl prov/usnic/configure.m4 for details.
 FI_PROVIDER_SETUP([usnic])
 FI_PROVIDER_SETUP([gni])
 FI_PROVIDER_SETUP([udp])
-FI_PROVIDER_SETUP([net])
+FI_PROVIDER_SETUP([tcp])
 FI_PROVIDER_SETUP([rxm])
 FI_PROVIDER_SETUP([mrail])
 FI_PROVIDER_SETUP([rxd])

diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile
@@ -156,7 +156,7 @@ pipeline {
                   else
                     rm -rf ${env.WORKSPACE}/py_scripts && mkdir ${env.WORKSPACE}/py_scripts
                   fi
-                  
+
                   git clone --branch ${TARGET} ${env.UPSTREAM} ${env.WORKSPACE}/py_scripts
 
                   echo "Copy log dirs."
@@ -416,12 +416,12 @@ pipeline {
                   cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
                   python3.7 runtests.py --prov=verbs --util=rxm --test=mpichtestsuite
                   echo "verbs-rxm MPICH testsuite completed."
+                  python3.7 runtests.py --prov=tcp --test=mpichtestsuite
+                  echo "tcp MPICH testsuite completed."
                   python3.7 runtests.py --prov=tcp --util=rxm --test=mpichtestsuite
                   echo "tcp-rxm MPICH testsuite completed."
                   python3.7 runtests.py --prov=sockets --test=mpichtestsuite
                   echo "sockets MPICH testsuite completed."
-                  python3.7 runtests.py --prov=net --test=mpichtestsuite
-                  echo "net MPICH testsuite completed."
                   echo "MPICH testsuite completed."
                 )
               """
@@ -439,8 +439,6 @@ pipeline {
                   cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
                   python3.7 runtests.py --prov=tcp --test=shmem
                   echo "SHMEM tcp completed."
-                  python3.7 runtests.py --prov=net --test=shmem
-                  echo "SHMEM net completed."
                   python3.7 runtests.py --prov=verbs --test=shmem
                   echo "SHMEM verbs completed."
                   python3.7 runtests.py --prov=sockets --test=shmem
@@ -463,8 +461,6 @@ pipeline {
                       cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
                       python3.7 runtests.py --prov=tcp --test=multinode
                       echo "multinode tcp performance completed."
-                      python3.7 runtests.py --prov=net --test=multinode
-                      echo "multinode net performance completed."
                       echo "multinode performance completed."
                   )
                 """
@@ -482,6 +478,8 @@ pipeline {
                   cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
                   python3.7 runtests.py --prov=tcp --util=rxm --test=oneccl
                   echo "oneCCL tcp-rxm completed."
+                  python3.7 runtests.py --prov=tcp --test=oneccl
+                  echo "oneCCL tcp completed."
                   python3.7 runtests.py --prov=psm3 --test=oneccl
                   echo "oneCCL psm3 completed."
                   echo "OneCCL completed."
@@ -571,89 +569,6 @@ pipeline {
             }
           }
         }
-        stage('net') {
-          agent { node { label 'cvl' } }
-          options { skipDefaultCheckout() }
-          steps {
-            withEnv(['PATH+EXTRA=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin/:$PYTHONPATH']) {
-              sh """
-                env
-                (
-                  cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
-                  python3.7 runtests.py --prov=net --test=fabtests
-                  python3.7 runtests.py --prov=net --test=fabtests --ofi_build_mode=dbg
-                  python3.7 runtests.py --prov=net --test=fabtests --ofi_build_mode=dl
-                  echo "net completed."
-                )
-              """
-            }
-          }
-        }
-        // separate imb tests into 3 stages rather than 1 to hopefully run in parallel
-        stage('MPI_net-1') {
-          agent { node { label 'cvl' } }
-          options { skipDefaultCheckout() }
-          steps {
-            withEnv(['PATH+EXTRA=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin/:$PYTHONPATH']) {
-              sh """
-                env
-                (
-                  cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
-                  python3.7 runtests.py --prov=net --test=IMB --imb_grp=1
-                  echo "MPI_net Group 1 completed."
-                )
-              """
-            }
-          }
-        }
-        stage('MPI_net-2') {
-          agent { node { label 'cvl' } }
-          options { skipDefaultCheckout() }
-          steps {
-            withEnv(['PATH+EXTRA=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin/:$PYTHONPATH']) {
-              sh """
-                env
-                (
-                  cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
-                  python3.7 runtests.py --prov=net --test=IMB --imb_grp=2
-                  echo "MPI_net Group 2 completed."
-                )
-              """
-            }
-          }
-        }
-        stage('MPI_net-3') {
-          agent { node { label 'cvl' } }
-          options { skipDefaultCheckout() }
-          steps {
-            withEnv(['PATH+EXTRA=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin/:$PYTHONPATH']) {
-              sh """
-                env
-                (
-                  cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
-                  python3.7 runtests.py --prov=net --test=IMB --imb_grp=3
-                  echo "MPI_net Group 3 completed."
-                )
-              """
-            }
-          }
-        }
-        stage('MPI_net-osu') {
-          agent { node { label 'cvl' } }
-          options { skipDefaultCheckout() }
-          steps {
-            withEnv(['PATH+EXTRA=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin/:$PYTHONPATH']) {
-              sh """
-                env
-                (
-                  cd ${env.WORKSPACE}/${SCRIPT_LOCATION}/
-                  python3.7 runtests.py --prov=net --test=osu
-                  echo "MPI-net-osu completed."
-                )
-              """
-            }
-          }
-        }
       }
     }
     stage ('Summary') {

diff --git a/contrib/intel/jenkins/common.py b/contrib/intel/jenkins/common.py
@@ -51,24 +51,21 @@ def run_command(command, logdir=None, test_type=None, ofi_build_mode=None):
    Prov('verbs', 'rxm'),
    Prov('sockets', None),
    Prov('tcp', None),
-   Prov('net', None),
    Prov('udp', None),
    Prov('udp', 'rxd'),
    Prov('shm', None),
 ]
 default_prov_list = [
     'verbs',
     'tcp',
-    'net',
     'sockets',
     'udp',
     'shm',
     'psm3'
 ]
 daos_prov_list = [
     'verbs',
-    'tcp',
-    'net'
+    'tcp'
 ]
 dsa_prov_list = [
     'shm'

diff --git a/contrib/intel/jenkins/runtests.py b/contrib/intel/jenkins/runtests.py
@@ -9,7 +9,7 @@
 parser = argparse.ArgumentParser()
 
 parser.add_argument('--prov', help="core provider", choices=['verbs', \
-                     'tcp', 'udp', 'sockets', 'shm', 'psm3', 'net'])
+                     'tcp', 'udp', 'sockets', 'shm', 'psm3'])
 parser.add_argument('--util', help="utility provider", choices=['rxd', 'rxm'])
 parser.add_argument('--ofi_build_mode', help="specify the build configuration", \
                     choices = ['dbg', 'dl'], default='reg')

diff --git a/contrib/intel/jenkins/summary.py b/contrib/intel/jenkins/summary.py
@@ -130,7 +130,7 @@ def print_results(self):
 
     def check_name(self, line):
         return
- 
+
     def check_pass(self, line):
         return
 
@@ -557,7 +557,7 @@ def summarize_items(summary_item, logger, log_dir, mode):
 
     if summary_item == 'imb' or summary_item == 'all':
         for mpi in mpi_list:
-            for item in ['tcp-rxm', 'verbs-rxm', 'net']:
+            for item in ['tcp-rxm', 'verbs-rxm', 'tcp']:
                 ret = ImbSummarizer(
                     logger, log_dir, item, mpi,
                     f'MPI_{item}_{mpi}_IMB_{mode}',
@@ -631,9 +631,9 @@ def summarize_items(summary_item, logger, log_dir, mode):
             ).summarize()
             err += ret if ret else 0
 
-    if ((summary_item == 'daos' or summary_item == 'all') 
+    if ((summary_item == 'daos' or summary_item == 'all')
          and mode == 'reg'):
-        for prov in ['tcp', 'verbs']:       
+        for prov in ['tcp', 'verbs']:
             ret = DaosSummarizer(
                 logger, log_dir, prov,
                 f'daos_{prov}_daos_{mode}',

diff --git a/contrib/intel/jenkins/tests.py b/contrib/intel/jenkins/tests.py
@@ -549,7 +549,7 @@ def __init__(self, jobname, buildno, testname, core_prov, fabric,
     @property
     def execute_condn(self):
         # Mpich and ompi are excluded to save time. Run manually if needed
-        return (self.mpi_type == 'impi' and self.core_prov != 'net')
+        return (self.mpi_type == 'impi')
 
     def imb_cmd(self, imb_test):
         print(f"Running IMB-{imb_test}")
@@ -595,9 +595,9 @@ def __init__(self, jobname, buildno, testname, core_prov, fabric,
 
     @property
     def execute_condn(self):
-        # mpich-tcp, ompi, and net are the only osu test combinations failing
+        # mpich-tcp, ompi are the only osu test combinations failing
         return False if ((self.mpi_type == 'mpich' and self.core_prov == 'tcp') or \
-                          self.mpi_type == 'ompi' or self.core_prov == 'net') \
+                          self.mpi_type == 'ompi') \
                      else True
 
     def osu_cmd(self, test_type, test):
@@ -660,9 +660,7 @@ def set_options(self, nprocs, timeout=None):
 
     @property
     def execute_condn(self):
-        # net provider shouldn't run with MPI for now
-        return ((self.mpi_type == 'impi' and self.core_prov != 'net')
-                or (self.mpi_type == 'mpich' and self.core_prov == 'verbs'))
+        return (self.mpi_type == 'mpich' and self.core_prov == 'verbs')
 
     def execute_cmd(self, testgroupname):
         print("Running Tests: " + testgroupname)

diff --git a/fabtests/Makefile.am b/fabtests/Makefile.am
@@ -94,8 +94,8 @@ nobase_dist_config_DATA = \
 	test_configs/osx.exclude \
         test_configs/eq_cq.test \
         test_configs/lat_bw.test \
-	test_configs/net/all.test \
-	test_configs/net/net.exclude \
+	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 \

diff --git a/fabtests/test_configs/net/all.test → fabtests/test_configs/tcp/all.test b/fabtests/test_configs/net/all.test → fabtests/test_configs/tcp/all.test
@@ -1,6 +1,6 @@
-#: "Suite of tests for the net provider"
+#: "Suite of tests for the  provider"
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 		FT_TEST_BANDWIDTH,
@@ -32,7 +32,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 		FT_TEST_BANDWIDTH,
@@ -67,7 +67,7 @@
 	],
 }
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 	],
@@ -94,7 +94,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 	],
@@ -121,7 +121,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_UNIT,
 	],
@@ -152,7 +152,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_UNIT,
 	],
@@ -184,7 +184,7 @@
 	],
 }
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_UNIT,
 		FT_TEST_LATENCY,
@@ -219,7 +219,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_UNIT,
 		FT_TEST_LATENCY,
@@ -255,7 +255,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_UNIT,
 		FT_TEST_LATENCY,
@@ -292,7 +292,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 	],
@@ -319,7 +319,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 	],
@@ -346,7 +346,7 @@
 	],
 },
 {
-	prov_name: net,
+	prov_name: tcp,
 	test_type: [
 		FT_TEST_LATENCY,
 	],

diff --git a/fabtests/test_configs/net/net.exclude → fabtests/test_configs/tcp/tcp.exclude b/fabtests/test_configs/net/net.exclude → fabtests/test_configs/tcp/tcp.exclude