Ticket #6924 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Add parallel reduction button to SNS UIs

Reported by: Mathieu Doucet Owned by: Mathieu Doucet
Priority: major Milestone: Release 2.6
Component: Framework Keywords:
Cc: Blocked By: #4884
Blocking: #6523 Tester: Ross Miller

Description (last modified by Mathieu Doucet) (diff)

Add parallel reduction button to UIs for EQSANS and DGSReduction.

The scope of this ticket is only to develop the infrastructure to submit remote jobs from the reduction UI. Job tracking will be part of another ticket.

Change History

comment:1 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 7fb10c099fb78662ca759e2ffabf621ee8749f3f

comment:2 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 1d67b627ec437ec756d00f0fc7004b53941ddc68

comment:3 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: cd24f6c1fedfe40c4d884993c024e20549035cdc

comment:4 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 8ef6188a8a3c44a9aca8b3c7e14e72f762f787c9

comment:5 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 6ea044e59918fe8124b5793ca44acad428934e9d

comment:6 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 76c53410c1d9304023e99813f97ae4f50a1c719a

comment:7 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 8a085b515935ec1018617c4620b3443312aa4575

comment:8 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 57e6f4b015a52610fe1ca22ab2e93ce6ba82367f

comment:9 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 6628fc10f5d47c2bb54a43d224b64be2a7bf8ec8

comment:10 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 24682e8b4cb155b777d28af854593ce7a6b06e86

comment:11 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 844d56dc79d6a1253111d0a18235ffbff7e5cd7e

comment:12 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 7fb10c099fb78662ca759e2ffabf621ee8749f3f

comment:13 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 1d67b627ec437ec756d00f0fc7004b53941ddc68

comment:14 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: c1f77750f0c21a2f46bbf66068a73683281f5b8a

comment:15 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: cd24f6c1fedfe40c4d884993c024e20549035cdc

comment:16 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 8ef6188a8a3c44a9aca8b3c7e14e72f762f787c9

comment:17 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 6ea044e59918fe8124b5793ca44acad428934e9d

comment:18 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 76c53410c1d9304023e99813f97ae4f50a1c719a

comment:19 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 8a085b515935ec1018617c4620b3443312aa4575

comment:20 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 57e6f4b015a52610fe1ca22ab2e93ce6ba82367f

comment:21 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 6628fc10f5d47c2bb54a43d224b64be2a7bf8ec8

comment:22 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 24682e8b4cb155b777d28af854593ce7a6b06e86

comment:23 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 844d56dc79d6a1253111d0a18235ffbff7e5cd7e

comment:24 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 7fb10c099fb78662ca759e2ffabf621ee8749f3f

comment:25 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 1d67b627ec437ec756d00f0fc7004b53941ddc68

comment:26 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: c1f77750f0c21a2f46bbf66068a73683281f5b8a

comment:27 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: cd24f6c1fedfe40c4d884993c024e20549035cdc

comment:28 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 8ef6188a8a3c44a9aca8b3c7e14e72f762f787c9

comment:29 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 6ea044e59918fe8124b5793ca44acad428934e9d

comment:30 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 76c53410c1d9304023e99813f97ae4f50a1c719a

comment:31 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 8a085b515935ec1018617c4620b3443312aa4575

comment:32 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 57e6f4b015a52610fe1ca22ab2e93ce6ba82367f

comment:33 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 6628fc10f5d47c2bb54a43d224b64be2a7bf8ec8

comment:34 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 24682e8b4cb155b777d28af854593ce7a6b06e86

comment:35 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 844d56dc79d6a1253111d0a18235ffbff7e5cd7e

comment:36 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 7fb10c099fb78662ca759e2ffabf621ee8749f3f

comment:37 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 1d67b627ec437ec756d00f0fc7004b53941ddc68

comment:38 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: c1f77750f0c21a2f46bbf66068a73683281f5b8a

comment:39 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: cd24f6c1fedfe40c4d884993c024e20549035cdc

comment:40 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 8ef6188a8a3c44a9aca8b3c7e14e72f762f787c9

comment:41 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 6ea044e59918fe8124b5793ca44acad428934e9d

comment:42 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 76c53410c1d9304023e99813f97ae4f50a1c719a

comment:43 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 8a085b515935ec1018617c4620b3443312aa4575

comment:44 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 57e6f4b015a52610fe1ca22ab2e93ce6ba82367f

comment:45 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 6628fc10f5d47c2bb54a43d224b64be2a7bf8ec8

comment:46 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 24682e8b4cb155b777d28af854593ce7a6b06e86

comment:47 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 844d56dc79d6a1253111d0a18235ffbff7e5cd7e

comment:48 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 7fb10c099fb78662ca759e2ffabf621ee8749f3f

comment:49 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 1d67b627ec437ec756d00f0fc7004b53941ddc68

comment:50 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: c1f77750f0c21a2f46bbf66068a73683281f5b8a

comment:51 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: cd24f6c1fedfe40c4d884993c024e20549035cdc

comment:52 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 8ef6188a8a3c44a9aca8b3c7e14e72f762f787c9

comment:53 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: 6ea044e59918fe8124b5793ca44acad428934e9d

comment:54 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 76c53410c1d9304023e99813f97ae4f50a1c719a

comment:55 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 8a085b515935ec1018617c4620b3443312aa4575

comment:56 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 57e6f4b015a52610fe1ca22ab2e93ce6ba82367f

comment:57 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 6628fc10f5d47c2bb54a43d224b64be2a7bf8ec8

comment:58 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 24682e8b4cb155b777d28af854593ce7a6b06e86

comment:59 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 844d56dc79d6a1253111d0a18235ffbff7e5cd7e

comment:60 Changed 7 years ago by Nick Draper

  • Milestone changed from Release 2.5 to Release 2.6

Moved to r2.6 at the end of r2.5

comment:61 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: bfc6fb6e292b8d89335a50f175b2b82ddbe7cdb0

comment:62 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 96913a4076a1593fc2770740c39f0e6182250a31

comment:63 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 22800795cc72c25e08994d1f0614d9cbff5f3592

comment:64 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 2dee1318452f3ba918acb3184dcecbd3fe462433

comment:65 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 164b093c71dc855553b5181631ed66af1fa20368

comment:66 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 0e82c7f50cfe133b7868439d051c745029091cd3

comment:67 Changed 7 years ago by Mathieu Doucet

Re #6924 First cut at remote job submission

Changeset: b19705ba14887e5dbe5f183c022c2260ae4e75c2

comment:68 Changed 7 years ago by Mathieu Doucet

Re #6924 testing new branch setup

Changeset: bfc6fb6e292b8d89335a50f175b2b82ddbe7cdb0

comment:69 Changed 7 years ago by Mathieu Doucet

Re #6924 Add option to show parallel reduction submit button

Changeset: 96913a4076a1593fc2770740c39f0e6182250a31

comment:70 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix small issue with diffraction UI imports

Changeset: 22800795cc72c25e08994d1f0614d9cbff5f3592

comment:71 Changed 7 years ago by Mathieu Doucet

Re #6924 Add remote sub prep

Changeset: 2dee1318452f3ba918acb3184dcecbd3fe462433

comment:72 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix issue with starting UIs

Changeset: 164b093c71dc855553b5181631ed66af1fa20368

comment:73 Changed 7 years ago by Mathieu Doucet

Re #6924 Add mantid property to turn cluster sub on/off

Changeset: 0e82c7f50cfe133b7868439d051c745029091cd3

comment:74 Changed 7 years ago by Mathieu Doucet

Re #6924 First cut at remote job submission

Changeset: b19705ba14887e5dbe5f183c022c2260ae4e75c2

comment:75 Changed 7 years ago by Mathieu Doucet

Re #6924 First cut at remote job submission

Changeset: 4d0e6d631581ddee9434f98a60b281fc9eebf570

comment:76 Changed 7 years ago by Mathieu Doucet

Re #6924 Set Fermi as cluster - to be cleaned later

Changeset: 0b9d0e00d581a8631fb02f0aba097d9f04289944

comment:77 Changed 7 years ago by Mathieu Doucet

Re #6924 Set Fermi as cluster - to be cleaned later

Changeset: 0b9d0e00d581a8631fb02f0aba097d9f04289944

comment:78 Changed 7 years ago by Mathieu Doucet

Re #6924 load mantid on cluster - test

Changeset: 1a9d0f63c58691b1e098f29a817092a8a0d6645b

comment:79 Changed 7 years ago by Mathieu Doucet

Re #6924 load mantid on cluster - test

Changeset: 1a9d0f63c58691b1e098f29a817092a8a0d6645b

comment:80 Changed 7 years ago by Mathieu Doucet

Re #6924 this is a test

Changeset: fbe89acfcefabf5188e4e1123c675b5933b26d59

comment:81 Changed 7 years ago by Mathieu Doucet

Re #6924 this is a test

Changeset: fbe89acfcefabf5188e4e1123c675b5933b26d59

comment:82 Changed 7 years ago by Mathieu Doucet

Re #6924 trying to submit to Fermi

Changeset: b5d358fbc4ed8f77a6d9d16d254e737c638be165

comment:83 Changed 7 years ago by Mathieu Doucet

Re #6924 trying to submit to Fermi

Changeset: b5d358fbc4ed8f77a6d9d16d254e737c638be165

comment:84 Changed 7 years ago by Mathieu Doucet

Re #6924 Add more option to job submission

Changeset: a4b065822e569d9e07fe34be42a64b5f1b0534e2

comment:85 Changed 7 years ago by Mathieu Doucet

Re #6924 Add more option to job submission

Changeset: a4b065822e569d9e07fe34be42a64b5f1b0534e2

comment:86 Changed 7 years ago by Mathieu Doucet

Re #6924 Add more option to job submission

Changeset: 073b06d70e854fa10d8159fc9ae76bfddd2d10d7

comment:87 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix cluster submission

Changeset: 781705522f234abca5196001e48d4ec5138eb5d1

comment:88 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix cluster submission

Changeset: 781705522f234abca5196001e48d4ec5138eb5d1

comment:89 Changed 7 years ago by Mathieu Doucet

Re #6924 Change script file permissions

Changeset: 83a86e064cf1d610f3fcc99280e00db90e2626a4

comment:90 Changed 7 years ago by Mathieu Doucet

Re #6924 Change script file permissions

Changeset: 83a86e064cf1d610f3fcc99280e00db90e2626a4

comment:91 Changed 7 years ago by Mathieu Doucet

Re #6924 Change script file permissions

Changeset: 975c70d02732d568ccc0d7b7d33df0a6301214c3

comment:92 Changed 7 years ago by Mathieu Doucet

Re #6924 Change script file permissions

Changeset: 975c70d02732d568ccc0d7b7d33df0a6301214c3

comment:93 Changed 7 years ago by Mathieu Doucet

Re #6924 add box for number of nodes

Changeset: a406f53bfdb7e3837aaae06d920b121588edcd79

comment:94 Changed 7 years ago by Mathieu Doucet

Re #6924 add box for number of nodes

Changeset: a406f53bfdb7e3837aaae06d920b121588edcd79

comment:95 Changed 7 years ago by Mathieu Doucet

Re #6924 expose remote option menu

Changeset: 7afc721fc705d642a4d642356568e265efcfaf8f

comment:96 Changed 7 years ago by Mathieu Doucet

Re #6924 expose remote option menu

Changeset: 7afc721fc705d642a4d642356568e265efcfaf8f

comment:97 Changed 7 years ago by Mathieu Doucet

Re #6924 expose remote option menu

Changeset: 3b80ebab9d9a2d606c41cde46096f667f585a49f

comment:98 Changed 7 years ago by Mathieu Doucet

Re #6924 expose remote option menu

Changeset: 3b80ebab9d9a2d606c41cde46096f667f585a49f

comment:99 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: bef2d0b546ad02fc61a26079bfacda9453d9c9db

comment:100 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: 19d01edb699aaa2812598939b74c1abab46f26a7

comment:101 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: 6a67a184221f9bf01a32dad9f342717677c5c20b

comment:102 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: bef2d0b546ad02fc61a26079bfacda9453d9c9db

comment:103 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: 19d01edb699aaa2812598939b74c1abab46f26a7

comment:104 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: 6a67a184221f9bf01a32dad9f342717677c5c20b

comment:105 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: fda64d9d871970e5d1b4a80e5eb7e292ad88a495

comment:106 Changed 7 years ago by Mathieu Doucet

Re #6924 make sample thickness optional

Changeset: fda64d9d871970e5d1b4a80e5eb7e292ad88a495

comment:107 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we have the right instrument for remote jobs

Changeset: e5227c421318d5fdfac5940f636d6250775f075f

comment:108 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we have the right instrument for remote jobs

Changeset: e5227c421318d5fdfac5940f636d6250775f075f

comment:109 Changed 7 years ago by Mathieu Doucet

  • Status changed from new to accepted

comment:110 Changed 7 years ago by Mathieu Doucet

  • Blocked By 4884 added

comment:111 Changed 7 years ago by Mathieu Doucet

Re #6924 Enable remote sub for diffraction and DGS.

Changeset: d25d07e33e8d65034cf0946acb61330d725de022

comment:112 Changed 7 years ago by Mathieu Doucet

Re #6924 Enable remote sub for diffraction and DGS.

Changeset: d25d07e33e8d65034cf0946acb61330d725de022

comment:113 Changed 7 years ago by Mathieu Doucet

  • Description modified (diff)

comment:114 Changed 7 years ago by Mathieu Doucet

  • Status changed from accepted to verify
  • Resolution set to fixed

To test:

  • Log on the analysis cluster at SNS.
  • Compile Mantid using cmake with -DMAKE_REMOTE_JOBS=TRUE
  • Add "cluster.submission=on" to your Mantid user properties (in ~/.mantid/Mantid.user.properties)
  • Start the EQSANS reduction UI.
  • Load reasonable reduction parameters (enough to execute a reduction).
  • Make sure to pick a location for the output directory (first tab).
  • Click the "Send cluster" button. You should be prompted for your credential. A job should then be submitted to Fermi. The results will appear wherever the output directory your chose is.
  • Check the STDIN files in your home directory for errors.
  • Once the job is completed. Just click the "reduce" button. The output from running on the cluster and running locally should be the same.

Alternate path:

  • Under the Tools menu of the EQSANS reduction UI, pick "Use Mantid Python API v2".
  • Repeat the test above after having selected the API v2.
Last edited 7 years ago by Mathieu Doucet (previous) (diff)

comment:115 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we find the right python API on compute node

Changeset: d1f04d5628ef8522c8508fb2ec1b4980e168619e

comment:116 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we find the right python API on compute node

Changeset: d1f04d5628ef8522c8508fb2ec1b4980e168619e

comment:117 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we find the right python API on compute node

Changeset: 71b28bbe748ac01654580d9874c310b4657a2b3c

comment:118 Changed 7 years ago by Mathieu Doucet

Re #6924 Make sure we find the right python API on compute node

Changeset: 71b28bbe748ac01654580d9874c310b4657a2b3c

comment:119 Changed 7 years ago by Mathieu Doucet

Re #6924 change the way number of jobs is determined

Changeset: df17b941852545fc4851dbf942f5881392a851c9

comment:120 Changed 7 years ago by Mathieu Doucet

Re #6924 change the way number of jobs is determined

Changeset: df17b941852545fc4851dbf942f5881392a851c9

comment:121 Changed 7 years ago by Mathieu Doucet

Re #6924 Test multi-job submit

Changeset: 2a220d332711dd695e2b7f033a0e9274813eeaf1

comment:122 Changed 7 years ago by Mathieu Doucet

Re #6924 Test multi-job submit

Changeset: 2a220d332711dd695e2b7f033a0e9274813eeaf1

comment:123 Changed 7 years ago by Mathieu Doucet

Re #6924 Test multi-job submit

Changeset: bf578ce20b7f18f23f83524c57505b44975cde5c

comment:124 Changed 7 years ago by Mathieu Doucet

Re #6924 Test multi-job submit

Changeset: bf578ce20b7f18f23f83524c57505b44975cde5c

comment:125 Changed 7 years ago by mathieu

Re #6924 Expand run ranges

Changeset: 644b37c03600f4e877a9f0e560b42e4c6d9edf2f

comment:126 Changed 7 years ago by Mathieu Doucet

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:127 Changed 7 years ago by mathieu

Re #6924 Expand run ranges

Changeset: 644b37c03600f4e877a9f0e560b42e4c6d9edf2f

comment:128 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix range expansion

Changeset: 357fe2a04d17ba681b0b031082b4c550d011bb3e

comment:129 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix range expansion

Changeset: 357fe2a04d17ba681b0b031082b4c550d011bb3e

comment:130 Changed 7 years ago by Mathieu Doucet

  • Status changed from reopened to accepted

comment:131 Changed 7 years ago by Mathieu Doucet

  • Status changed from accepted to verify
  • Resolution set to fixed

See comment:114 to test.

comment:132 Changed 7 years ago by Russell Taylor

Because of the change to Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp, this cannot be tested and merged to master until #4884 has first been (otherwise it won't compile).

comment:133 Changed 7 years ago by Russell Taylor

  • Blocking 6523 added

comment:134 Changed 7 years ago by Alex Buts

Merge branch 'feature/6855_ExplicitQFrame' of ​https://github.com/mantidproject/mantid into develop into 6856_ConvertToDiffractionMDWS_v2

comment:135 Changed 7 years ago by Mathieu Doucet

Merge remote branch 'origin/master' into feature/6924_par_red_ui into 6856_ConvertToDiffractionMDWS_v2

comment:136 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/6913_rhel6_rpm' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:137 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_par_red_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:138 Changed 7 years ago by Andrei Savici

Merge branch 'feature/6965_wiki_links' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:139 Changed 7 years ago by Peter Peterson

Merge branch 'bugfix/6907_qtassistant_mac' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:140 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:141 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:142 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:143 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:144 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:145 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:146 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:147 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:148 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:149 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:150 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:151 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:152 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:153 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:154 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:155 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:156 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:157 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:158 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:159 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:160 Changed 7 years ago by mathieu

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:161 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:162 Changed 7 years ago by Alex Buts

Merge branch 'feature/6855_ExplicitQFrame' of ​https://github.com/mantidproject/mantid into develop into 6856_ConvertToDiffractionMDWS_v2

comment:163 Changed 7 years ago by Mathieu Doucet

Merge remote branch 'origin/master' into feature/6924_par_red_ui into 6856_ConvertToDiffractionMDWS_v2

comment:164 Changed 7 years ago by Stuart Campbell

Merge branch 'feature/6913_rhel6_rpm' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:165 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_par_red_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:166 Changed 7 years ago by Andrei Savici

Merge branch 'feature/6965_wiki_links' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:167 Changed 7 years ago by Peter Peterson

Merge branch 'bugfix/6907_qtassistant_mac' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:168 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:169 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:170 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:171 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:172 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:173 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:174 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:175 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:176 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:177 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:178 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:179 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:180 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:181 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:182 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:183 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:184 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:185 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:186 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:187 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:188 Changed 7 years ago by mathieu

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:189 Changed 7 years ago by Mathieu Doucet

Merge branch 'feature/6924_parallel_reduction_ui' into develop into 6856_ConvertToDiffractionMDWS_v2

comment:190 Changed 7 years ago by Vickie Lynch

  • Status changed from verify to verifying
  • Tester set to Vickie Lynch

comment:191 Changed 7 years ago by Vickie Lynch

Refs #6924 auto merge failed

Changeset: 64cd61ff89a347364c9b9091f05ccb8507956869

comment:192 Changed 7 years ago by Vickie Lynch

  • Status changed from verifying to reopened
  • Resolution fixed deleted 
Compile failed for me:
/home/vel/mantid/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp: In function ‘void export_FacilityInfo()’:
/home/vel/mantid/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp:54: error: ‘computeResources’ is not a member of ‘Mantid::Kernel::FacilityInfo’
At global scope:
cc1plus: warning: unrecognized command line option "-Wno-unused-result"
make[2]: *** [Framework/PythonInterface/mantid/kernel/CMakeFiles/PythonKernelModule.dir/src/Exports/FacilityInfo.cpp.o] Error 1

comment:193 Changed 7 years ago by Mathieu Doucet

  • Status changed from reopened to accepted

Yes. That's normal. Ticket #4884 is a blocker for this ticket and can't be tested and merged into master until #4884 is completed.

To test: see comment:114 [But wait until #4884 is closed]

comment:194 Changed 7 years ago by Mathieu Doucet

  • Status changed from accepted to verify
  • Resolution set to fixed

comment:195 Changed 7 years ago by Vickie Lynch

Refs #6924 trivial merge conflicts resolved

Changeset: c37c9611362a3d074eb40a7398e231e5ec093b3a

comment:196 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix minor conflicts

Changeset: 797fe9effb7f7de8767d7de540125a053b5f76b6

comment:197 Changed 7 years ago by Mathieu Doucet

Re #6924 Fix minor conflicts

Changeset: aee2840811a2d6b530b39c518ece6057eabfe2f7

comment:198 Changed 7 years ago by Ross Miller

  • Status changed from verify to verifying
  • Tester changed from Vickie Lynch to Ross Miller

comment:199 Changed 7 years ago by Ross Miller

  • Status changed from verifying to closed

Was able to submit a job to Fermi and watch it run. Looks like there's a problem with the reduction output, but it's with the code that runs on Fermi, so we'll handle it in another ticket.

comment:200 Changed 7 years ago by Nick Draper

  • Component changed from Mantid to Framework

comment:201 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​7770

Note: See TracTickets for help on using tickets.