svn commit: r560881 - head/net/mpich

[Jan Beich]

Author: jbeich
Date: Sat Jan  9 17:51:19 2021
New Revision: 560881
URL: https://svnweb.freebsd.org/changeset/ports/560881

Log:
  net/mpich: unbreak with level-zero after r560756
  
  level-zero is pulled as a build-only dependency of intel-compute-runtime.
  mpich support for level-zero is broken and uses pre-1.0 API (before r545238).
  
  src/gpu/mpl_gpu_ze.c:123:11: warning: implicit declaration of function 'zeDriverGetMemIpcHandle' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverGetMemIpcHandle(global_ze_driver_handle, ptr, ipc_handle);
            ^
  src/gpu/mpl_gpu_ze.c:139:9: warning: implicit declaration of function 'zeDriverOpenMemIpcHandle' is invalid in C99 [-Wimplicit-function-declaration]
          zeDriverOpenMemIpcHandle(global_ze_driver_handle,
          ^
  src/gpu/mpl_gpu_ze.c:140:70: error: no member named 'global_dev_id' in 'struct _ze_ipc_mem_handle_t'
                                   global_ze_devices_handle[ipc_handle.global_dev_id],
                                                            ~~~~~~~~~~ ^
  src/gpu/mpl_gpu_ze.c:141:45: error: no member named 'handle' in 'struct _ze_ipc_mem_handle_t'
                                   ipc_handle.handle, ZE_IPC_MEMORY_FLAG_NONE, ptr);
                                   ~~~~~~~~~~ ^
  src/gpu/mpl_gpu_ze.c:141:53: error: use of undeclared identifier 'ZE_IPC_MEMORY_FLAG_NONE'; did you mean 'ZE_IPC_MEMORY_FLAG_TBD'?
                                   ipc_handle.handle, ZE_IPC_MEMORY_FLAG_NONE, ptr);
                                                      ^~~~~~~~~~~~~~~~~~~~~~~
  src/gpu/mpl_gpu_ze.c:156:11: warning: implicit declaration of function 'zeDriverCloseMemIpcHandle' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverCloseMemIpcHandle(global_ze_driver_handle, ptr);
            ^
  src/gpu/mpl_gpu_ze.c:171:11: warning: implicit declaration of function 'zeDriverGetMemAllocProperties' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverGetMemAllocProperties(global_ze_driver_handle, ptr, &ptr_attr, &device);
            ^
  src/gpu/mpl_gpu_ze.c:202:25: error: use of undeclared identifier 'ZE_DEVICE_MEM_ALLOC_FLAG_DEFAULT'
      device_desc.flags = ZE_DEVICE_MEM_ALLOC_FLAG_DEFAULT;
                          ^
  src/gpu/mpl_gpu_ze.c:204:17: error: no member named 'version' in 'struct _ze_device_mem_alloc_desc_t'
      device_desc.version = ZE_DEVICE_MEM_ALLOC_DESC_VERSION_CURRENT;
      ~~~~~~~~~~~ ^
  src/gpu/mpl_gpu_ze.c:204:27: error: use of undeclared identifier 'ZE_DEVICE_MEM_ALLOC_DESC_VERSION_CURRENT'
      device_desc.version = ZE_DEVICE_MEM_ALLOC_DESC_VERSION_CURRENT;
                            ^
  src/gpu/mpl_gpu_ze.c:208:11: warning: implicit declaration of function 'zeDriverAllocDeviceMem' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverAllocDeviceMem(global_ze_driver_handle, &device_desc,
            ^
  src/gpu/mpl_gpu_ze.c:223:23: error: use of undeclared identifier 'ZE_HOST_MEM_ALLOC_FLAG_DEFAULT'
      host_desc.flags = ZE_HOST_MEM_ALLOC_FLAG_DEFAULT;
                        ^
  src/gpu/mpl_gpu_ze.c:224:15: error: no member named 'version' in 'struct _ze_host_mem_alloc_desc_t'
      host_desc.version = ZE_HOST_MEM_ALLOC_DESC_VERSION_CURRENT;
      ~~~~~~~~~ ^
  src/gpu/mpl_gpu_ze.c:224:25: error: use of undeclared identifier 'ZE_HOST_MEM_ALLOC_DESC_VERSION_CURRENT'
      host_desc.version = ZE_HOST_MEM_ALLOC_DESC_VERSION_CURRENT;
                          ^
  src/gpu/mpl_gpu_ze.c:229:11: warning: implicit declaration of function 'zeDriverAllocHostMem' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverAllocHostMem(global_ze_driver_handle, &host_desc, size, mem_alignment, ptr);
            ^
  src/gpu/mpl_gpu_ze.c:240:11: warning: implicit declaration of function 'zeDriverFreeMem' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverFreeMem(global_ze_driver_handle, ptr);
            ^
  src/gpu/mpl_gpu_ze.c:251:11: warning: implicit declaration of function 'zeDriverFreeMem' is invalid in C99 [-Wimplicit-function-declaration]
      ret = zeDriverFreeMem(global_ze_driver_handle, ptr);
            ^
  src/gpu/mpl_gpu_ze.c:280:19: error: use of undeclared identifier 'device_handles'; did you mean 'dev_handle'?
      *dev_handle = device_handles[dev_id];
                    ^~~~~~~~~~~~~~
  
  PR:		252536
  Reported by:	Nick, thierry

Modified:
  head/net/mpich/Makefile   (contents, props changed)

Modified: head/net/mpich/Makefile
==============================================================================
--- head/net/mpich/Makefile	Sat Jan  9 17:06:20 2021	(r560880)
+++ head/net/mpich/Makefile	Sat Jan  9 17:51:19 2021	(r560881)
@@ -54,6 +54,8 @@ DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
 DHYDRA_DESC=	Make hydra the default process manager
 
+CONFIGURE_ENV=	ac_cv_header_level_zero_ze_api_h=no \
+		ac_cv_lib_ze_loader_zeInit=no
 CONFIGURE_ARGS=	--enable-fast="" --with-hwloc-prefix=${LOCALBASE} \
 		--with-libfabric=${LOCALBASE} \
 		pkgconfigdir="${PREFIX}/libdata/pkgconfig" \