merged

--- a/Admin/jenkins/build/ci_build_benchmark.scala	Thu Oct 04 15:25:47 2018 +0100
+++ b/Admin/jenkins/build/ci_build_benchmark.scala	Thu Oct 04 15:25:58 2018 +0100
@@ -4,8 +4,8 @@
   import isabelle._
 
   override def documents = false
-  def threads = 6
-  def jobs = 1
+  override def threads = 6
+  override def jobs = 1
   def include = Nil
   def select = List(Path.explode("$ISABELLE_HOME/src/Benchmarks"))
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/jenkins/build/ci_build_mac.scala	Thu Oct 04 15:25:58 2018 +0100
@@ -0,0 +1,16 @@
+object profile extends isabelle.CI_Profile
+{
+
+  import isabelle._
+
+  override def threads = 2
+  override def jobs = 1
+  def include = Nil
+  def select = Nil
+
+  def pre_hook(args: List[String]) = {}
+  def post_hook(results: Build.Results) = {}
+
+  def selection = Sessions.Selection(all_sessions = true, exclude_sessions = List("HOL-Proofs"))
+
+}

--- a/Admin/jenkins/build/ci_build_makeall_seq.scala	Thu Oct 04 15:25:47 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-object profile extends isabelle.CI_Profile
-{
-
-  import isabelle._
-
-  def threads = 2
-  def jobs = 1
-  def include = Nil
-  def select = Nil
-
-  def pre_hook(args: List[String]) = {}
-  def post_hook(results: Build.Results) = {}
-
-  def selection = Sessions.Selection(all_sessions = true, exclude_sessions = List("HOL-Proofs"))
-
-}

--- a/src/Pure/Admin/ci_profile.scala	Thu Oct 04 15:25:47 2018 +0100
+++ b/src/Pure/Admin/ci_profile.scala	Thu Oct 04 15:25:58 2018 +0100
@@ -96,6 +96,8 @@
         .int.update("parallel_proofs", 1)
         .int.update("threads", threads)
 
+    println(s"jobs = $jobs, threads = $threads, numa = $numa")
+
     print_section("BUILD")
     println(s"Build started at $start_time")
     println(s"Isabelle id $isabelle_id")
@@ -133,15 +135,25 @@
     System.exit(results.rc)
   }
 
+  /* profile */
 
-  /* profile */
+  def threads: Int = Isabelle_System.hostname() match {
+    case "hpcisabelle" => 8
+    case "lxcisa1" => 4
+    case _ => 2
+  }
+
+  def jobs: Int = Isabelle_System.hostname() match {
+    case "hpcisabelle" => 8
+    case "lxcisa1" => 10
+    case _ => 2
+  }
+
+  def numa: Boolean = Isabelle_System.hostname() == "hpcisabelle"
 
   def documents: Boolean = true
   def clean: Boolean = true
-  def numa: Boolean = false
 
-  def threads: Int
-  def jobs: Int
   def include: List[Path]
   def select: List[Path]