[Bf-blender-cvs] [0634bb24ee7] master: Cleanup: remove unused server app after network render was removed

Brecht Van Lommel noreply at git.blender.org
Fri Apr 29 17:46:46 CEST 2022


Commit: 0634bb24ee70e77cdc42241e3a237f2ade9ee0e7
Author: Brecht Van Lommel
Date:   Sat Apr 16 22:11:35 2022 +0200
Branches: master
https://developer.blender.org/rB0634bb24ee70e77cdc42241e3a237f2ade9ee0e7

Cleanup: remove unused server app after network render was removed

===================================================================

D	intern/cycles/app/cycles_server.cpp

===================================================================

diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp
deleted file mode 100644
index f12a0875298..00000000000
--- a/intern/cycles/app/cycles_server.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0
- * Copyright 2011-2022 Blender Foundation */
-
-#include <stdio.h>
-
-#include "device/device.h"
-
-#include "util/args.h"
-#include "util/foreach.h"
-#include "util/log.h"
-#include "util/path.h"
-#include "util/stats.h"
-#include "util/string.h"
-#include "util/task.h"
-
-using namespace ccl;
-
-int main(int argc, const char **argv)
-{
-  util_logging_init(argv[0]);
-  path_init();
-
-  /* device types */
-  string devicelist = "";
-  string devicename = "cpu";
-  bool list = false, debug = false;
-  int threads = 0, verbosity = 1;
-
-  vector<DeviceType> &types = Device::available_types();
-
-  foreach (DeviceType type, types) {
-    if (devicelist != "")
-      devicelist += ", ";
-
-    devicelist += Device::string_from_type(type);
-  }
-
-  /* parse options */
-  ArgParse ap;
-
-  ap.options("Usage: cycles_server [options]",
-             "--device %s",
-             &devicename,
-             ("Devices to use: " + devicelist).c_str(),
-             "--list-devices",
-             &list,
-             "List information about all available devices",
-             "--threads %d",
-             &threads,
-             "Number of threads to use for CPU device",
-#ifdef WITH_CYCLES_LOGGING
-             "--debug",
-             &debug,
-             "Enable debug logging",
-             "--verbose %d",
-             &verbosity,
-             "Set verbosity of the logger",
-#endif
-             NULL);
-
-  if (ap.parse(argc, argv) < 0) {
-    fprintf(stderr, "%s\n", ap.geterror().c_str());
-    ap.usage();
-    exit(EXIT_FAILURE);
-  }
-
-  if (debug) {
-    util_logging_start();
-    util_logging_verbosity_set(verbosity);
-  }
-
-  if (list) {
-    vector<DeviceInfo> &devices = Device::available_devices();
-
-    printf("Devices:\n");
-
-    foreach (DeviceInfo &info, devices) {
-      printf("    %s%s\n", info.description.c_str(), (info.display_device) ? " (display)" : "");
-    }
-
-    exit(EXIT_SUCCESS);
-  }
-
-  /* find matching device */
-  DeviceType device_type = Device::type_from_string(devicename.c_str());
-  vector<DeviceInfo> &devices = Device::available_devices();
-  DeviceInfo device_info;
-
-  foreach (DeviceInfo &device, devices) {
-    if (device_type == device.type) {
-      device_info = device;
-      break;
-    }
-  }
-
-  TaskScheduler::init(threads);
-
-  while (1) {
-    Stats stats;
-    Device *device = Device::create(device_info, stats, true);
-    printf("Cycles Server with device: %s\n", device->info.description.c_str());
-    device->server_run();
-    delete device;
-  }
-
-  TaskScheduler::exit();
-
-  return 0;
-}



More information about the Bf-blender-cvs mailing list