prov/netdir: Remove provider

NetworkDirect is now supported by the verbs provider. Signed-off-by: Sean Hefty <[email protected]> Signed-off-by: Jianxin Xiong <[email protected]>
ofiwg · Dec 17, 2023 · 52be148 · 52be148
1 parent 5c1900d
commit 52be148
Show file tree

Hide file tree

Showing 35 changed files with 127 additions and 9,445 deletions.
diff --git a/.appveyor.ps1 b/.appveyor.ps1
@@ -12,7 +12,7 @@ $wd=$PWD.Path; & { Add-Type -A "System.IO.Compression.FileSystem"; [IO.Compressi
 Write-Verbose "done"
 
 Write-Verbose "moving NetworkDirect headers.."
-move NetDirect\include\* prov\netdir\NetDirect
+move NetDirect\include\* include\windows
 Write-Verbose "done"
 
 $efaWinVersion="1.0.0"

diff --git a/README.md b/README.md
@@ -283,9 +283,8 @@ See the `fi_netdir(7)` man page for more details.
 - The Network Direct provider requires Network Direct SPI. If you are compiling
   libfabric from source and want to enable Network Direct support, you will also
   need the matching header files for the Network Direct SPI.
-  If the libraries and header files are not in default paths (the default path is
-  root of provier directory, i.e. \prov\netdir\NetDirect, where NetDirect contains
-  the header files), specify them in the configuration properties of the VS project.
+  If the libraries and header files are not in default paths, specify them in the
+  configuration properties of the VS project.
 
 ### shm
 
@@ -327,8 +326,8 @@ It is possible to compile and link libfabric with windows applications.
   on page press Download button and select NetworkDirect_DDK.zip.
 
   Extract header files from downloaded
-  NetworkDirect_DDK.zip:`\NetDirect\include\` file into `<libfabricroot>\prov\netdir\NetDirect\`,
-  or add path to NetDirect headers into VS include paths
+  NetworkDirect_DDK.zip:`\NetDirect\include\` into `include\windows`, or
+  add the path to NetDirect headers into VS include paths
 
 - 2. compiling:
   libfabric has 6 Visual Studio solution configurations:

diff --git a/libfabric.vcxproj b/libfabric.vcxproj
diff --git a/libfabric.vcxproj.filters b/libfabric.vcxproj.filters
@@ -79,15 +79,6 @@
     <Filter Include="Source Files\prov\rxd\include">
       <UniqueIdentifier>{e89f94da-f0f0-4e62-aad4-d738963d7dd9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\prov\netdir">
-      <UniqueIdentifier>{bbe0be7c-1187-45ab-bd2e-5c1f61095a9b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\prov\netdir\include">
-      <UniqueIdentifier>{9ba21998-278b-4f63-9ff2-8fb533eeee84}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\prov\netdir\src">
-      <UniqueIdentifier>{b3471da7-1f83-4d3f-b31c-89b197aa6327}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\prov\tcp">
       <UniqueIdentifier>{5547753c-42f5-4cb6-a311-07911724f5cf}</UniqueIdentifier>
     </Filter>
@@ -435,57 +426,6 @@
     <ClCompile Include="src\iov.c">
       <Filter>Source Files\src</Filter>
     </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_addr.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_cq.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_domain.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ep.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_fabric.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_fs.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_init.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_pep.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_eq.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ov.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_mr.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_cntr.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ep_msg.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ep_rma.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ep_srx.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_unexp.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
-    <ClCompile Include="prov\netdir\src\netdir_ndinit.c">
-      <Filter>Source Files\prov\netdir\src</Filter>
-    </ClCompile>
     <ClCompile Include="prov\util\src\util_ns.c">
       <Filter>Source Files\prov\util</Filter>
     </ClCompile>
@@ -651,6 +591,12 @@
     <ClCompile Include="prov\verbs\src\windows\verbs_nd_init.c">
       <Filter>Source Files\prov\verbs\src\windows</Filter>
     </ClCompile>
+    <ClCompile Include="prov\verbs\src\windows\verbs_nd_addr.c">
+      <Filter>Source Files\prov\verbs\src\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="prov\verbs\src\windows\verbs_nd_fs.c">
+      <Filter>Source Files\prov\verbs\src\windows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\fasthash.h">
@@ -839,33 +785,6 @@
     <ClInclude Include="prov\rxm\src\rxm.h">
       <Filter>Source Files\prov\rxm\include</Filter>
     </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_log.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_iface.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_ov.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_util.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_queue.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_cq.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_unexp.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
-    <ClInclude Include="prov\netdir\src\netdir_buf.h">
-      <Filter>Source Files\prov\netdir\include</Filter>
-    </ClInclude>
     <ClInclude Include="include\windows\sys\wait.h">
       <Filter>Header Files\windows\sys</Filter>
     </ClInclude>

diff --git a/prov/netdir/NetDirect/README.NetworkDirect b/prov/netdir/NetDirect/README.NetworkDirect
diff --git a/prov/netdir/src/netdir.h b/prov/netdir/src/netdir.h