New task policy implementation is pulling in old experimental code.

[rppawlo]

I'm trying to build against the new non-experimental TaskPolicy (snapshotting current kokkos develop branch into Trilinos) but the trilinos cmake build does a glob of the source directory for the .cpp files. This pulls in the Cuda experimental file Kokkos_Cuda_TaskPolicy.cpp which no longer works or at least is not protected correctly with ifdefs. In the build below I have disabled the cuda node (building openmp only) yet kokkos fails to compile when attempting to build the deprecated cuda task policy code.

1. Any ETA on when the new task policy will be pushed into Trilinos?
2. Any chance the old tasking policy code in experimental namespace can be removed before going into Trilinos? Anyone looking at the task code to learn how to use it also can see parts of the old experimental code in the same files as the new code. This is an issue because the only way to catch what objects not to use it is by checking the namespace that each object is declared in (experimental or not).

Roger

rppawlo@drekar:~/BUILD/packages/kokkos$ make
[  0%] Building CXX object packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/Cuda/Kokkos_Cuda_TaskPolicy.cpp.o
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:65:6: error: ‘CudaTaskPolicyQueue’ has not been declared
 void CudaTaskPolicyQueue::Destroy::destroy_shared_allocation()
      ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp: In function ‘void Kokkos::Experimental::Impl::destroy_shared_allocation()’:
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:69:8: error: ‘m_policy’ was not declared in this scope
   if ( m_policy->m_count_ready ||
        ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:79:3: error: ‘m_policy’ was not declared in this scope
   m_policy->~CudaTaskPolicyQueue();
   ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:79:33: error: expected class-name before ‘(’ token
   m_policy->~CudaTaskPolicyQueue();
                                 ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:81:11: error: ‘Kokkos::Cuda’ has not been declared
   Kokkos::Cuda::fence();
           ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp: At global scope:
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:84:1: error: ‘CudaTaskPolicyQueue’ does not name a type
 CudaTaskPolicyQueue::
 ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:89:1: error: ‘CudaTaskPolicyQueue’ does not name a type
 CudaTaskPolicyQueue::
 ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:101:3: error: expected unqualified-id before ‘,’ token
   , m_serial { 0 , 0 , 0 }
   ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:101:14: error: expected constructor, destructor, or type conversion before ‘{’ token
   , m_serial { 0 , 0 , 0 }
              ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:102:3: error: expected unqualified-id before ‘,’ token
   , m_team_size( 32 /* 1 warps */ )
   ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:102:16: error: expected constructor, destructor, or type conversion before ‘(’ token
   , m_team_size( 32 /* 1 warps */ )
                ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:928:1: error: expected ‘}’ at end of input
 } /* namespace Kokkos */
 ^
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:928:1: error: expected ‘}’ at end of input
/home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp:928:1: error: expected ‘}’ at end of input
packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/build.make:659: recipe for target 'packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/Cuda/Kokkos_Cuda_TaskPolicy.cpp.o' failed
make[2]: *** [packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/Cuda/Kokkos_Cuda_TaskPolicy.cpp.o] Error 1
CMakeFiles/Makefile2:1336: recipe for target 'packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/all' failed
make[1]: *** [packages/kokkos/core/src/CMakeFiles/kokkoscore.dir/all] Error 2
Makefile:160: recipe for target 'all' failed
make: *** [all] Error 2
rppawlo@drekar:~/BUILD/packages/kokkos$ e /home/rppawlo/Trilinos/packages/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp
rppawlo@drekar:~/BUILD/packages/kokkos$