Remove C Torque driver and tests

equinor · May 22, 2024 · a013666 · a013666
1 parent 1a8f31f
commit a013666
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 2,190 deletions.
diff --git a/setup.py b/setup.py
@@ -31,9 +31,6 @@ def package_files(directory):
         "ert": package_files("src/ert/gui/resources/")
         + package_files("src/ert/shared/share/")
         + ["logging/logger.conf", "logging/storage_log.conf"]
-        + [
-            "job_queue/qstat_proxy.sh",
-        ],
     },
     cmake_args=[
         "-DBUILD_TESTS=OFF",

diff --git a/src/clib/lib/CMakeLists.txt b/src/clib/lib/CMakeLists.txt
@@ -10,7 +10,6 @@ pybind11_add_module(
   job_queue/lsf_driver.cpp
   job_queue/queue_driver.cpp
   job_queue/slurm_driver.cpp
-  job_queue/torque_driver.cpp
   job_queue/spawn.cpp)
 
 # -----------------------------------------------------------------
@@ -23,13 +22,6 @@ target_include_directories(_clib PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
 set_target_properties(_clib PROPERTIES CXX_VISIBILITY_PRESET "default")
 install(TARGETS _clib LIBRARY DESTINATION src/ert)
 
-# This extra deploy is only for ctest to be able to locate the script, this file
-# is otherwise deployed through setup.py.
-file(
-  COPY "${CMAKE_CURRENT_SOURCE_DIR}/../../ert/job_queue/qstat_proxy.sh"
-  DESTINATION "${CMAKE_BINARY_DIR}/tests"
-  FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
-
 # -----------------------------------------------------------------
 # Target: 'libert.so' for use in tests
 # -----------------------------------------------------------------

diff --git a/src/clib/lib/include/ert/job_queue/queue_driver.hpp b/src/clib/lib/include/ert/job_queue/queue_driver.hpp
@@ -8,7 +8,6 @@ using job_driver_type = enum {
     NULL_DRIVER = 0,
     LSF_DRIVER = 1,
     LOCAL_DRIVER = 2,
-    TORQUE_DRIVER = 4,
     SLURM_DRIVER = 5
 };
 

diff --git a/src/clib/lib/include/ert/job_queue/torque_driver.hpp b/src/clib/lib/include/ert/job_queue/torque_driver.hpp
diff --git a/src/clib/lib/job_queue/queue_driver.cpp b/src/clib/lib/job_queue/queue_driver.cpp
@@ -2,7 +2,6 @@
 #include <ert/job_queue/lsf_driver.hpp>
 #include <ert/job_queue/queue_driver.hpp>
 #include <ert/job_queue/slurm_driver.hpp>
-#include <ert/job_queue/torque_driver.hpp>
 #include <fmt/format.h>
 #include <stdexcept>
 
@@ -92,16 +91,6 @@ queue_driver_type *queue_driver_alloc(job_driver_type type) {
         driver->get_option = local_driver_get_option;
         driver->data = local_driver_alloc();
         break;
-    case TORQUE_DRIVER:
-        driver->submit = torque_driver_submit_job;
-        driver->get_status = torque_driver_get_job_status;
-        driver->kill_job = torque_driver_kill_job;
-        driver->free_job = torque_driver_free_job;
-        driver->free_driver = torque_driver_free_;
-        driver->set_option = torque_driver_set_option;
-        driver->get_option = torque_driver_get_option;
-        driver->data = torque_driver_alloc();
-        break;
     case SLURM_DRIVER:
         driver->set_option = slurm_driver_set_option;
         driver->get_option = slurm_driver_get_option;