diff --git a/src/accelerator_cuda.h b/src/accelerator_cuda.h deleted file mode 100644 index be81718280..0000000000 --- a/src/accelerator_cuda.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- ---------------------------------------------------------- - LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator - http://lammps.sandia.gov, Sandia National Laboratories - Steve Plimpton, sjplimp@sandia.gov - - Copyright (2003) Sandia Corporation. Under the terms of Contract - DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains - certain rights in this software. This software is distributed under - the GNU General Public License. - - See the README file in the top-level LAMMPS directory. -------------------------------------------------------------------------- */ - -#ifndef LMP_ACCELERATOR_CUDA_H -#define LMP_ACCELERATOR_CUDA_H - -// true interface to USER-CUDA -// used when USER-CUDA is installed - -#ifdef LMP_USER_CUDA - -#include "user_cuda.h" -#include "comm_cuda.h" -#include "domain_cuda.h" -#include "neighbor_cuda.h" -#include "modify_cuda.h" -#include "verlet_cuda.h" - -#else - -// dummy interface to USER-CUDA -// needed for compiling when USER-CUDA is not installed - -#include "comm_brick.h" -#include "domain.h" -#include "neighbor.h" -#include "modify.h" -#include "verlet.h" - -namespace LAMMPS_NS { - -class Cuda { - public: - int cuda_exists; - int oncpu; - - Cuda(class LAMMPS *) {cuda_exists = 0;} - ~Cuda() {} - void accelerator(int, char **) {} - void evsetup_eatom_vatom(int, int) {} - void downloadAll() {} - void uploadAll() {} -}; - -class CommCuda : public CommBrick { - public: - CommCuda(class LAMMPS *lmp) : CommBrick(lmp) {} - ~CommCuda() {} -}; - -class DomainCuda : public Domain { - public: - DomainCuda(class LAMMPS *lmp) : Domain(lmp) {} - ~DomainCuda() {} -}; - -class NeighborCuda : public Neighbor { - public: - NeighborCuda(class LAMMPS *lmp) : Neighbor(lmp) {} - ~NeighborCuda() {} -}; - -class ModifyCuda : public Modify { - public: - ModifyCuda(class LAMMPS *lmp) : Modify(lmp) {} - ~ModifyCuda() {} -}; - -class VerletCuda : public Verlet { - public: - VerletCuda(class LAMMPS *lmp, int narg, char **arg) : Verlet(lmp,narg,arg) {} - ~VerletCuda() {} -}; - -} - -#endif -#endif diff --git a/src/lammps.cpp b/src/lammps.cpp index 56829e1246..af9950073f 100644 --- a/src/lammps.cpp +++ b/src/lammps.cpp @@ -42,7 +42,6 @@ #include "group.h" #include "output.h" #include "citeme.h" -#include "accelerator_cuda.h" #include "accelerator_kokkos.h" #include "accelerator_omp.h" #include "accelerator_intel.h" @@ -80,7 +79,6 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) int logflag = 0; int partscreenflag = 0; int partlogflag = 0; - int cudaflag = 0; int kokkosflag = 0; int restartflag = 0; int restartremapflag = 0; @@ -153,14 +151,6 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) error->universe_all(FLERR,"Invalid command-line argument"); partlogflag = iarg + 1; iarg += 2; - } else if (strcmp(arg[iarg],"-cuda") == 0 || - strcmp(arg[iarg],"-c") == 0) { - if (iarg+2 > narg) - error->universe_all(FLERR,"Invalid command-line argument"); - if (strcmp(arg[iarg+1],"on") == 0) cudaflag = 1; - else if (strcmp(arg[iarg+1],"off") == 0) cudaflag = 0; - else error->universe_all(FLERR,"Invalid command-line argument"); - iarg += 2; } else if (strcmp(arg[iarg],"-kokkos") == 0 || strcmp(arg[iarg],"-k") == 0) { if (iarg+2 > narg) @@ -470,25 +460,6 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) error->all(FLERR,"Small to big integers are not sized correctly"); #endif - // error check on accelerator packages - - if (cudaflag == 1 && kokkosflag == 1) - error->all(FLERR,"Cannot use -cuda on and -kokkos on together"); - - // create Cuda class if USER-CUDA installed, unless explicitly switched off - // instantiation creates dummy Cuda class if USER-CUDA is not installed - - cuda = NULL; - if (cudaflag == 1) { - cuda = new Cuda(this); - if (!cuda->cuda_exists) - error->all(FLERR,"Cannot use -cuda on without USER-CUDA installed"); - } - - int me; - MPI_Comm_rank(world,&me); - if (cuda && me == 0) error->message(FLERR,"USER-CUDA mode is enabled"); - // create Kokkos class if KOKKOS installed, unless explicitly switched off // instantiation creates dummy Kokkos class if KOKKOS is not installed // add args between kkfirst and kklast to Kokkos instantiation