Remove portfolio (#3236)

5 files changed, 0 insertions, 149 deletions

diff --git a/src/options/didyoumean_test.cpp b/src/options/didyoumean_test.cpp
index c6d92c97b..df1dfa5cc 100644
--- a/src/options/didyoumean_test.cpp
+++ b/src/options/didyoumean_test.cpp
@@ -289,8 +289,6 @@ set<string> getDebugTags() {
   a.insert("parser-param");
   a.insert("partial_model");
   a.insert("pb");
-  a.insert("pickle");
-  a.insert("pickler");
   a.insert("pipe");
   a.insert("portfolio::outputmode");
   a.insert("prec");
diff --git a/src/options/main_options.toml b/src/options/main_options.toml
index 71c964678..84ac7d955 100644
--- a/src/options/main_options.toml
+++ b/src/options/main_options.toml
@@ -79,55 +79,6 @@ header = "options/main_options.h"
   help       = "do not run destructors at exit; default on except in debug builds"
 
 [[option]]
-  name       = "threads"
-  category   = "regular"
-  long       = "threads=N"
-  type       = "unsigned"
-  default    = "2"
-  predicates = ["unsignedGreater0"]
-  read_only  = true
-  help       = "Total number of threads for portfolio"
-
-[[option]]
-  category   = "regular"
-  long       = "threadN=string"
-  type       = "void"
-  handler    = "threadN"
-  read_only  = true
-  help       = "configures portfolio thread N (0..#threads-1)"
-
-[[option]]
-  name       = "threadStackSize"
-  category   = "regular"
-  long       = "thread-stack=N"
-  type       = "unsigned"
-  default    = "0"
-  read_only  = true
-  help       = "stack size for worker threads in MB (0 means use Boost/thread lib default)"
-
-[[option]]
-  name       = "threadArgv"
-  category   = "regular"
-  type       = "std::vector<std::string>"
-  includes   = ["<vector>", "<string>"]
-  help       = "Thread configuration (a string to be passed to parseOptions)"
-
-[[option]]
-  name       = "thread_id"
-  category   = "regular"
-  type       = "int"
-  default    = "-1"
-  help       = "Thread ID, for internal use in case of multi-threaded run"
-
-[[option]]
-  name       = "sharingFilterByLength"
-  category   = "regular"
-  long       = "filter-lemma-length=N"
-  type       = "int"
-  default    = "-1"
-  help       = "don't share (among portfolio threads) lemmas strictly longer than N"
-
-[[option]]
   name       = "fallbackSequential"
   category   = "regular"
   long       = "fallback-sequential"
diff --git a/src/options/options.h b/src/options/options.h
index 0d26c60b9..a21ce4583 100644
--- a/src/options/options.h
+++ b/src/options/options.h
@@ -228,8 +228,6 @@ public:
   bool getWaitToJoin() const;
   const std::string& getForceLogicString() const;
   const std::vector<std::string>& getThreadArgv() const;
-  int getSharingFilterByLength() const;
-  int getThreadId() const;
   int getVerbosity() const;
   std::istream* getIn() const;
   std::ostream* getErr();
@@ -238,16 +236,12 @@ public:
   std::string getBinaryName() const;
   std::string getReplayInputFilename() const;
   unsigned getParseStep() const;
-  unsigned getThreadStackSize() const;
-  unsigned getThreads() const;
 
   // TODO: Document these.
   void setInputLanguage(InputLanguage);
   void setInteractive(bool);
   void setOut(std::ostream*);
   void setOutputLanguage(OutputLanguage);
-  void setSharingFilterByLength(int length);
-  void setThreadId(int);
 
   bool wasSetByUserCeGuidedInst() const;
   bool wasSetByUserDumpSynth() const;
@@ -255,13 +249,9 @@ public:
   bool wasSetByUserForceLogicString() const;
   bool wasSetByUserIncrementalSolving() const;
   bool wasSetByUserInteractive() const;
-  bool wasSetByUserThreadStackSize() const;
-  bool wasSetByUserThreads() const;
 
   // Static accessor functions.
   // TODO: Document these.
-  static int currentGetSharingFilterByLength();
-  static int currentGetThreadId();
   static std::ostream* currentGetOut();
 
   /**
diff --git a/src/options/options_public_functions.cpp b/src/options/options_public_functions.cpp
index 43b44b93e..a753c08de 100644
--- a/src/options/options_public_functions.cpp
+++ b/src/options/options_public_functions.cpp
@@ -170,18 +170,6 @@ const std::string& Options::getForceLogicString() const{
   return (*this)[options::forceLogicString];
 }
 
-const std::vector<std::string>& Options::getThreadArgv() const{
-  return (*this)[options::threadArgv];
-}
-
-int Options::getSharingFilterByLength() const{
-  return (*this)[options::sharingFilterByLength];
-}
-
-int Options::getThreadId() const{
-  return (*this)[options::thread_id];
-}
-
 int Options::getVerbosity() const{
   return (*this)[options::verbosity];
 }
@@ -215,22 +203,6 @@ unsigned Options::getParseStep() const{
   return (*this)[options::parseStep];
 }
 
-unsigned Options::getThreadStackSize() const{
-  return (*this)[options::threadStackSize];
-}
-
-unsigned Options::getThreads() const{
-  return (*this)[options::threads];
-}
-
-int Options::currentGetSharingFilterByLength() {
-  return current()->getSharingFilterByLength();
-}
-
-int Options::currentGetThreadId() {
-  return current()->getThreadId();
-}
-
 std::ostream* Options::currentGetOut() {
   return current()->getOut();
 }
@@ -254,14 +226,6 @@ void Options::setOutputLanguage(OutputLanguage value) {
   set(options::outputLanguage, value);
 }
 
-void Options::setSharingFilterByLength(int length) {
-  set(options::sharingFilterByLength, length);
-}
-
-void Options::setThreadId(int value) {
-  set(options::thread_id, value);
-}
-
 bool Options::wasSetByUserCeGuidedInst() const {
   return wasSetByUser(options::ceGuidedInst);
 }
@@ -286,14 +250,6 @@ bool Options::wasSetByUserInteractive() const {
   return wasSetByUser(options::interactive);
 }
 
-bool Options::wasSetByUserThreadStackSize() const {
-  return wasSetByUser(options::threadStackSize);
-}
-
-bool Options::wasSetByUserThreads() const {
-  return wasSetByUser(options::threads);
-}
-
 
 void Options::flushErr() {
   if(getErr() != NULL) {
diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index b28d77437..b3c2975bb 100644
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -734,50 +734,6 @@ ${options_handler}$
 
     case '?':
     default:
-      if( ( optopt == 0 ||
-            ( optopt >= ${option_value_begin}$ &&
-              optopt <= ${option_value_end}$ )
-          ) && !strncmp(argv[optind - 1], "--thread", 8) &&
-          strlen(argv[optind - 1]) > 8 )
-      {
-        if(! isdigit(argv[optind - 1][8])) {
-          throw OptionException(formatThreadOptionException(option));
-        }
-        std::vector<std::string>& threadArgv = holder->threadArgv;
-        char *end;
-        long tnum = strtol(argv[optind - 1] + 8, &end, 10);
-        if(tnum < 0 || (*end != '\0' && *end != '=')) {
-          throw OptionException(formatThreadOptionException(option));
-        }
-        if(threadArgv.size() <= size_t(tnum)) {
-          threadArgv.resize(tnum + 1);
-        }
-        if(threadArgv[tnum] != "") {
-          threadArgv[tnum] += " ";
-        }
-        if(*end == '\0') { // e.g., we have --thread0 "foo"
-          if(argc <= optind) {
-            throw OptionException(std::string("option `") + option +
-                                  "' missing its required argument");
-          }
-          Debug("options") << "thread " << tnum << " gets option "
-                           << argv[optind] << std::endl;
-          threadArgv[tnum] += argv[main_optind];
-          main_optind++;
-        } else { // e.g., we have --thread0="foo"
-          if(end[1] == '\0') {
-            throw OptionException(std::string("option `") + option +
-                                  "' missing its required argument");
-          }
-          Debug("options") << "thread " << tnum << " gets option "
-                           << (end + 1) << std::endl;
-          threadArgv[tnum] += end + 1;
-        }
-        Debug("options") << "thread " << tnum << " now has "
-                         << threadArgv[tnum] << std::endl;
-        break;
-      }
-
       throw OptionException(std::string("can't understand option `") + option +
                             "'" + suggestCommandLineOptions(option));
     }