prov/psm: Remove psm as support was EOL several years ago

Signed-off-by: Adam Goldman <[email protected]>

Author: acgoldma

Makefile.am

@@ -448,7 +448,6 @@ include prov/udp/Makefile.include
 include prov/verbs/Makefile.include
 include prov/efa/Makefile.include
 include prov/usnic/Makefile.include
-include prov/psm/Makefile.include
 include prov/psm2/Makefile.include
 include prov/psm3/Makefile.include
 include prov/gni/Makefile.include

README.md

@@ -105,10 +105,10 @@ possible and all debug features will be disabled.
 Alternatively:
 
 ```bash
-$ ./configure --prefix=/opt/libfabric --enable-debug --enable-psm=dl && make -j 32 && sudo make install
+$ ./configure --prefix=/opt/libfabric --enable-debug --enable-psm3=dl && make -j 32 && sudo make install
 ```
 
-This will tell libfabric to enable the `psm` provider as a loadable library,
+This will tell libfabric to enable the `psm3` provider as a loadable library,
 enable all debug code paths, and install libfabric to the `/opt/libfabric`
 tree. All other providers will be enabled if possible.
 
@@ -158,25 +158,6 @@ PSM2 on the host software stack, leading to better overall performance.
 See the `fi_opx(7)` man page for more details. See [Cornelis Customer
 Center](https://customercenter.cornelisnetworks.com/) for support information.
 
-### psm
-
-***
-
-The `psm` provider runs over the PSM 1.x interface that is currently supported
-by the Intel TrueScale Fabric. PSM provides tag-matching message queue
-functions that are optimized for MPI implementations.  PSM also has limited
-Active Message support, which is not officially published but is quite stable
-and well documented in the source code (part of the OFED release). The `psm`
-provider makes use of both the tag-matching message queue functions and the
-Active Message functions to support various libfabric data transfer APIs,
-including tagged message queue, message queue, RMA, and atomic
-operations.
-
-The `psm` provider can work with the `psm2-compat` library, which exposes
-a PSM 1.x interface over the Intel Omni-Path Fabric.
-
-See the `fi_psm(7)` man page for more details.
-
 ### psm2
 
 ***

configure.ac

@@ -909,7 +909,6 @@ AS_CASE(["$LD"],
 
 dnl Provider-specific checks
 FI_PROVIDER_INIT
-FI_PROVIDER_SETUP([psm])
 FI_PROVIDER_SETUP([psm2])
 FI_PROVIDER_SETUP([psm3])
 FI_PROVIDER_SETUP([sockets])

contrib/buildrpm/README

@@ -87,5 +87,5 @@ General parameters:
     Print usage message and exit.
 
 Example usages of the script:
-  buildrpmLibfabric.sh -omsv -i usnic -e sockets -e verbs -e psm libfabric-1.4.1.tar.bz2
+  buildrpmLibfabric.sh -omsv -i usnic -e sockets -e verbs -e psm3 libfabric-1.4.1.tar.bz2
   buildrpmLibfabric.sh -omsv -c "--disable-silent-rules" libfabric-1.4.1.tar.bz2

contrib/intel/jenkins/common.py

@@ -50,7 +50,6 @@ def run_command(command):
 ]
 common_disable_list = [
     'usnic',
-    'psm',
     'efa',
     'perf',
     'rstream',

fabtests/Makefile.am

@@ -112,7 +112,6 @@ nobase_dist_config_DATA = \
 	test_configs/verbs/verbs.exclude \
 	test_configs/usnic/all.test \
 	test_configs/usnic/quick.test \
-	test_configs/psm/all.test \
 	test_configs/psm2/all.test \
 	test_configs/psm2/verify.test \
 	test_configs/psm2/psm2.exclude \

fabtests/man/fabtests.7.md

@@ -536,12 +536,12 @@ the list available for that test.
 
 ## An example with various options
 
-	run server: fi_rdm_atomic -p psm -s 192.168.0.123 -I 1000 -S 1024
-	run client: fi_rdm_atomic 192.168.0.123 -p psm -I 1000 -S 1024
+	run server: fi_rdm_atomic -p psm3 -s 192.168.0.123 -I 1000 -S 1024
+	run client: fi_rdm_atomic 192.168.0.123 -p psm3 -I 1000 -S 1024
 
 This will run "fi_rdm_atomic" for all atomic operations with
 
-	- PSM provider
+	- PSM3 provider
 	- 1000 iterations
 	- 1024 bytes message size
 	- server node as 123.168.0.123
@@ -591,11 +591,11 @@ By default if none of the options are provided, it runs all the tests using
 Various options can be used to choose provider, subset tests to run,
 level of verbosity etc.
 
-	runfabtests.sh -vvv -t all psm 192.168.0.123 192.168.0.124
+	runfabtests.sh -vvv -t all psm3 192.168.0.123 192.168.0.124
 
 This will run all fabtests using
 
-	- psm provider
+	- psm3 provider
 	- for different options and larger iterations
 	- server node as 192.168.0.123 and client node as 192.168.0.124
 	- print test output for all the tests

fabtests/test_configs/psm/all.test

@@ -90,17 +90,6 @@ EFA_INI ;
 #  define EFA_INIT NULL
 #endif
 
-#if (HAVE_PSM) && (HAVE_PSM_DL)
-#  define PSM_INI FI_EXT_INI
-#  define PSM_INIT NULL
-#elif (HAVE_PSM)
-#  define PSM_INI INI_SIG(fi_psm_ini)
-#  define PSM_INIT fi_psm_ini()
-PSM_INI ;
-#else
-#  define PSM_INIT NULL
-#endif
-
 #if (HAVE_PSM2) && (HAVE_PSM2_DL)
 #  define PSM2_INI FI_EXT_INI
 #  define PSM2_INIT NULL

include/ofi_prov.h

@@ -205,6 +205,9 @@ enum {
 	FI_SOCKADDR_IN,		/* struct sockaddr_in */
 	FI_SOCKADDR_IN6,	/* struct sockaddr_in6 */
 	FI_SOCKADDR_IB,		/* struct sockaddr_ib */
+	/*  PSMX provider is deprecated.
+	 *  We will keep this value in order to save binary compatibility.
+	 */
 	FI_ADDR_PSMX,		/* uint64_t */
 	FI_ADDR_GNI,
 	FI_ADDR_BGQ,
@@ -310,6 +313,9 @@ enum {
 	FI_PROTO_RDMA_CM_IB_RC,
 	FI_PROTO_IWARP,
 	FI_PROTO_IB_UD,
+	/*  PSMX provider is deprecated.
+	 *  We will keep this value in order to save binary compatibility.
+	 */
 	FI_PROTO_PSMX,
 	FI_PROTO_UDP,
 	FI_PROTO_SOCK_TCP,

include/rdma/fabric.h

@@ -47,9 +47,6 @@
 /* Define to 1 if you have the <netlink/version.h> header file. */
 /* #undef HAVE_NETLINK_VERSION_H */
 
-/* psm provider is built */
-/* #undef HAVE_PSM */
-
 /* perf provider is built */
 #define HAVE_PERF 1
 
@@ -62,12 +59,6 @@
 /* Define to 1 if you have the <psm2.h> header file. */
 /* #undef HAVE_PSM2_H */
 
-/* psm provider is built as DSO */
-/* #undef HAVE_PSM_DL */
-
-/* Define to 1 if you have the <psm.h> header file. */
-/* #undef HAVE_PSM_H */
-
 /* Define to 1 if you have the <rdma/rsocket.h> header file. */
 /* #undef HAVE_RDMA_RSOCKET_H */
 

include/windows/config.h

@@ -200,11 +200,11 @@ FI_LOG_SUBSYS environment variables.
   separated fashion. If the list begins with the '^' symbol, then the list will
   be negated. By default all providers are enabled.
 
-  Example: To enable logging from the psm and sockets provider:
-	FI_LOG_PROV="psm,sockets"
+  Example: To enable logging from the psm3 and sockets provider:
+	FI_LOG_PROV="psm3,sockets"
 
-  Example: To enable logging from providers other than psm:
-	FI_LOG_PROV="^psm"
+  Example: To enable logging from providers other than psm3:
+	FI_LOG_PROV="^psm3"
 
 *FI_LOG_SUBSYS*
 : The FI_LOG_SUBSYS environment variable enables or disables logging at the

man/fabric.7.md

@@ -709,11 +709,6 @@ protocol value set to one.
   This adds reliable-datagram semantics over the NetworkDirect connection-
   oriented endpoint semantics.
 
-*FI_PROTO_PSMX*
-: The protocol is based on an Intel proprietary protocol known as PSM,
-  performance scaled messaging.  PSMX is an extended version of the
-  PSM protocol to support the libfabric interfaces.
-
 *FI_PROTO_PSMX2*
 : The protocol is based on an Intel proprietary protocol known as PSM2,
   performance scaled messaging version 2.  PSMX2 is an extended version of the

man/fi_endpoint.3.md

@@ -636,10 +636,6 @@ fabric.  See [`fi_av`(3)](fi_av.3.html).
 : Address is a Cray proprietary format that is used with their GNI
   protocol.
 
-*FI_ADDR_PSMX*
-: Address is an Intel proprietary format used with their Performance Scaled
-  Messaging protocol.
-
 *FI_ADDR_PSMX2*
 : Address is an Intel proprietary format used with their Performance Scaled
   Messaging protocol version 2.
@@ -690,10 +686,6 @@ address_format[://[node][:[service][/[field3]...][?[key=value][&k2=v2]...]]]
 *FI_SOCKADDR_IN6*
 : Address is of type sockaddr_in6 (IPv6).
 
-*FI_ADDR_PSMX*
-: Address is an Intel proprietary format that is used with their PSMX
-  (extended performance scaled messaging) protocol.
-
 # FLAGS
 
 The operation of the fi_getinfo call may be controlled through the use of

man/fi_getinfo.3.md

@@ -72,7 +72,7 @@ given domains cannot communicate, then the application will fail.
 ## Fabric Filtering
 
 *-p \<provider_name\>*
-: The name of the underlying fabric provider (e.g., sockets, psm, usnic, etc.).
+: The name of the underlying fabric provider (e.g., sockets, psm3, usnic, etc.).
   If a provider is not specified via the -p switch, the test will pick one from
   the list of available providers (as returned by fi_getinfo(3)).