Merge release-next into main

mantidproject · Jan 16, 2025 · 8529cc9 · 8529cc9
2 parents fc0059c + 5ac5173
commit 8529cc9
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 142 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -59,10 +59,7 @@
       "inherits": [
         "ci-default",
         "conda"
-      ],
-      "cacheVariables": {
-        "PROFILE_ALGORITHM_LINUX": "ON"
-      }
+      ]
     },
     {
       "name": "win-64-ci",
@@ -123,10 +120,7 @@
       "inherits": [
         "unix-debug",
         "conda"
-      ],
-      "cacheVariables": {
-        "PROFILE_ALGORITHM_LINUX": "ON"
-      }
+      ]
     },
     {
       "name": "win-vs-2019",

diff --git a/Framework/API/CMakeLists.txt b/Framework/API/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(SRC_FILES
     src/ADSValidator.cpp
     src/Algorithm.cpp
+    src/AlgorithmExecuteProfile.cpp
     src/AlgorithmFactory.cpp
     src/AlgorithmFactoryObserver.cpp
     src/AlgorithmHasProperty.cpp
@@ -10,6 +11,7 @@ set(SRC_FILES
     src/AlgorithmProperties.cpp
     src/AlgorithmProperty.cpp
     src/AlgorithmRuntimeProps.cpp
+    src/AlgoTimeRegister.cpp
     src/AnalysisDataService.cpp
     src/AnalysisDataServiceObserver.cpp
     src/ArchiveSearchFactory.cpp
@@ -375,6 +377,7 @@ set(TEST_FILES
     AlgorithmPropertyTest.h
     AlgorithmRuntimePropsTest.h
     AlgorithmTest.h
+    AlgoTimeRegisterTest.h
     AnalysisDataServiceObserverTest.h
     AnalysisDataServiceTest.h
     AsynchronousTest.h
@@ -483,15 +486,6 @@ set(TEST_FILES
     WorkspaceUnitValidatorTest.h
 )
 
-option(PROFILE_ALGORITHM_LINUX "Profile algorithm execution on Linux" OFF)
-if(PROFILE_ALGORITHM_LINUX)
-  set(SRC_FILES "${SRC_FILES}" "src/AlgorithmExecuteProfile.cpp" "src/AlgoTimeRegister.cpp")
-  set(INC_FILES "${INC_FILES}" "inc/MantidAPI/AlgoTimeRegister.h")
-  set(TEST_FILES "${TEST_FILES}" "AlgoTimeRegisterTest.h")
-else()
-  set(SRC_FILES "${SRC_FILES}" "src/AlgorithmExecute.cpp")
-endif()
-
 set(GMOCK_TEST_FILES ImplicitFunctionFactoryTest.h ImplicitFunctionParameterParserFactoryTest.h MatrixWorkspaceTest.h)
 
 if(COVERAGE)

diff --git a/Framework/API/src/AlgorithmExecute.cpp b/Framework/API/src/AlgorithmExecute.cpp
diff --git a/Framework/API/test/AlgoTimeRegisterTest.h b/Framework/API/test/AlgoTimeRegisterTest.h
@@ -18,8 +18,6 @@
 
 using Mantid::Instrumentation::AlgoTimeRegister;
 using Mantid::Kernel::ConfigService;
-using std::filesystem::exists;
-using std::filesystem::remove_all;
 
 class AlgoTimeRegisterTest : public CxxTest::TestSuite {
 public:
@@ -34,16 +32,19 @@ class AlgoTimeRegisterTest : public CxxTest::TestSuite {
   };
 
   AlgoTimeRegisterTest() {
-    if (mkdir(m_directory.c_str(), 0777) == -1) {
+
+    const auto &path = m_directory.c_str();
+    if (!std::filesystem::create_directory(path)) {
       std::cerr << "Error :  " << strerror(errno) << std::endl;
     }
+    std::filesystem::permissions(path, std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
     ConfigService::Instance().setString("performancelog.filename", m_directory + "test.log");
     ConfigService::Instance().setString("performancelog.write", "On");
     AlgoTimeRegister::Instance();
   }
 
   ~AlgoTimeRegisterTest() override {
-    remove_all(m_directory);
+    std::filesystem::remove_all(m_directory);
     ConfigService::Instance().setString("performancelog.filename", "");
     ConfigService::Instance().setString("performancelog.write", "Off");
   }
@@ -186,7 +187,7 @@ class AlgoTimeRegisterTest : public CxxTest::TestSuite {
 
     // Add the time entry
     AlgoTimeRegister::Instance().addTime("TestAlgorithm", startTime, endTime);
-    TS_ASSERT(!exists(m_directory + "noWrite.log"));
+    TS_ASSERT(!std::filesystem::exists(m_directory + "noWrite.log"));
   }
 
 private:

diff --git a/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -8,6 +8,7 @@ set(EXPORT_FILES
     src/Exports/IAlgorithm.cpp
     src/Exports/AlgorithmObserver.cpp
     src/Exports/AlgorithmHistory.cpp
+    src/Exports/AlgoTimeRegister.cpp
     src/Exports/CatalogManager.cpp
     src/Exports/CatalogSession.cpp
     src/Exports/DeprecatedAlgorithmChecker.cpp
@@ -90,10 +91,6 @@ set(EXPORT_FILES
     src/Exports/RegionSelectorObserver.cpp
 )
 
-if(PROFILE_ALGORITHM_LINUX)
-  set(EXPORT_FILES "${EXPORT_FILES}" "src/Exports/AlgoTimeRegister.cpp")
-endif()
-
 set(MODULE_DEFINITION ${CMAKE_CURRENT_BINARY_DIR}/api.cpp)
 create_module(${MODULE_TEMPLATE} ${MODULE_DEFINITION} ${EXPORT_FILES})
 

diff --git a/Framework/PythonInterface/mantid/api/_aliases.py b/Framework/PythonInterface/mantid/api/_aliases.py
@@ -8,11 +8,10 @@
 Defines a set of aliases to make accessing certain objects easier
 """
 
-import sys
-
 from mantid.api import (
     AlgorithmFactoryImpl,
     AlgorithmManagerImpl,
+    AlgoTimeRegisterImpl,
     AnalysisDataServiceImpl,
     CatalogManagerImpl,
     FileFinderImpl,
@@ -43,12 +42,6 @@
 FunctionFactory = lazy_instance_access(FunctionFactoryImpl)
 WorkspaceFactory = lazy_instance_access(WorkspaceFactoryImpl)
 CatalogManager = lazy_instance_access(CatalogManagerImpl)
-if sys.platform.startswith("linux"):
-    try:
-        from mantid.api import AlgoTimeRegisterImpl
-
-        AlgoTimeRegister = lazy_instance_access(AlgoTimeRegisterImpl)
-    except:
-        AlgoTimeRegister = None
+AlgoTimeRegister = lazy_instance_access(AlgoTimeRegisterImpl)
 # backwards-compatible
 mtd = AnalysisDataService
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/AlgoTimeRegister.cpp b/Framework/PythonInterface/mantid/api/src/Exports/AlgoTimeRegister.cpp
@@ -16,7 +16,7 @@ using namespace Mantid::Instrumentation;
 using namespace boost::python;
 using Mantid::Kernel::time_point_ns;
 
-void addTimeWrapper(const std::string &name, long int begin, long int end) {
+void addTimeWrapper(const std::string &name, size_t begin, size_t end) {
 
   std::chrono::nanoseconds begin_ns(begin);
   std::chrono::nanoseconds end_ns(end);