Merge pull request #248 from ska-sa/prepare-release-4.x-2

A few more fixes before 4.x release

doc/changelog.rst

@@ -38,6 +38,8 @@ and the deprecation removals.
 - Remove build-time dependencies from :file:`requirements.txt`.
 - Update the :file:`.pyi` files to use more modern syntax e.g., :pep:`585`,
   :pep:`604`, :pep:`613`.
+- Replace references to nv_peer_mem with nvidia-peermem.
+- Increase TTL of :program:`gpudirect_example` to 4.
 
 .. _Meson: https://mesonbuild.com
 .. _ruff: https://beta.ruff.rs/docs/

examples/gpudirect_example.cu

@@ -16,9 +16,9 @@
 
 /* This example sends data directly from a GPU to the network, without
  * passing through the CPU, using GPUDirect RDMA. It requires
- * - An NVIDIA GPU
+ * - An NVIDIA data-centre GPU
  * - An NVIDIA (Mellanox) NIC
- * - The nv_peer_mem kernel module (https://github.com/Mellanox/nv_peer_memory)
+ * - The nvidia-peermem kernel module loaded
  * - It doesn't play nicely with IOMMU remapping. Adding "iommu=pt" to the
  *   kernel command line seems to help.
  *
@@ -29,7 +29,8 @@
  * It should print a message as it receives each heap.
  *
  * If the sender reports "ibv_reg_mr failed: Bad address" it probably means
- * that nv_peer_mem is not set up correctly.
+ * that nvidia-peermem is not set up correctly, or that your GPU is not a
+ * data-centre GPU.
  *
  * It should be noted that this example is intended for exposition rather
  * than high performance. For example, a real application would most likely
@@ -103,7 +104,8 @@ int main(int argc, const char * const *argv)
             boost::asio::ip::address::from_string("239.255.88.88"),
             8888));
     ibv_config.set_interface_address(boost::asio::ip::address::from_string(argv[1]));
-    // The nv_peer_mem kernel module recognises that dout is a device pointer
+    ibv_config.set_ttl(4);  // should be enough for most networks
+    // The nvidia-peermem kernel module recognises that dout is a device pointer
     ibv_config.add_memory_region(dout, size);
 
     auto empty_callback = [](const boost::system::error_code &ec,

meson.build

@@ -23,14 +23,15 @@ project(
   license_files : ['COPYING', 'COPYING.LESSER'],
   default_options : [
     'cpp_std=c++17',
+    'cuda_std=c++17',
     'b_ndebug=if-release',
     'buildtype=release',
     'default_library=static',
     'warning_level=2',
     'b_staticpic=false',  # The default of true harms performance
   ]
 )
-shared_lib_version = '4.0.0'
+shared_lib_version = '5.0.0'
 
 compiler = meson.get_compiler('cpp')
 py = import('python').find_installation(pure : false, modules : ['jinja2', 'pycparser', 'packaging'])