Kaynağa Gözat

Drop FSTARPU_MAX_WORKER, we won't actually use it

Samuel Thibault 4 yıl önce
ebeveyn
işleme
0d7f7dd77a
2 değiştirilmiş dosya ile 1 ekleme ve 4 silme
  1. 1 2
      include/starpu_worker.h
  2. 0 2
      src/util/fstarpu.c

+ 1 - 2
include/starpu_worker.h

@@ -67,8 +67,7 @@ enum starpu_worker_archtype
 	STARPU_OPENCL_WORKER=2,     /**< OpenCL device */
 	STARPU_MIC_WORKER=3,        /**< Intel MIC device */
 	STARPU_MPI_MS_WORKER=5,     /**< MPI Slave device */
-	STARPU_MAX_WORKER=5,        /**< maximum value of STARPU_*_WORKER */
-	STARPU_NARCH = (STARPU_MAX_WORKER+1), /**< Number of arch types */
+	STARPU_NARCH = 6,           /**< Number of arch types */
 	STARPU_ANY_WORKER=255       /**< any worker, used in the hypervisor */
 };
 

+ 0 - 2
src/util/fstarpu.c

@@ -80,7 +80,6 @@ static const intptr_t fstarpu_cpu_worker = STARPU_CPU_WORKER;
 static const intptr_t fstarpu_cuda_worker = STARPU_CUDA_WORKER;
 static const intptr_t fstarpu_opencl_worker = STARPU_OPENCL_WORKER;
 static const intptr_t fstarpu_mic_worker = STARPU_MIC_WORKER;
-static const intptr_t fstarpu_max_worker = STARPU_MAX_WORKER;
 static const intptr_t fstarpu_any_worker = STARPU_ANY_WORKER;
 static const intptr_t fstarpu_narch = STARPU_NARCH;
 
@@ -175,7 +174,6 @@ intptr_t fstarpu_get_constant(char *s)
 	else if (!strcmp(s, "FSTARPU_CUDA_WORKER"))	{ return fstarpu_cuda_worker; }
 	else if (!strcmp(s, "FSTARPU_OPENCL_WORKER"))	{ return fstarpu_opencl_worker; }
 	else if (!strcmp(s, "FSTARPU_MIC_WORKER"))	{ return fstarpu_mic_worker; }
-	else if (!strcmp(s, "FSTARPU_MAX_WORKER"))	{ return fstarpu_max_worker; }
 	else if (!strcmp(s, "FSTARPU_ANY_WORKER"))	{ return fstarpu_any_worker; }
 	else if (!strcmp(s, "FSTARPU_NARCH"))	{ return fstarpu_narch; }