Revert "[move] Cleaning up move API (#175)" (#176)

This reverts commit b7b1118.

Author: grospelliergilles

.devcontainer/devcontainer.json

@@ -1,15 +1,15 @@
 {
-  "build": {
-    "dockerfile": "Dockerfile"
-  },
-  "runArgs": [
-    "--cap-add=SYS_PTRACE",
-    "--security-opt",
-    "seccomp=unconfined"
-  ],
-  "postCreateCommand": "bash .devcontainer/install_spack.sh",
-  "userEnvProbe": "loginShell",
-  "extensions": [
-    "ms-vscode.cpptools-extension-pack"
-  ]
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined"
+    ],
+    "postCreateCommand": "bash .devcontainer/install_spack.sh",
+    "userEnvProbe": "loginShell",
+    "extensions": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
 }

.github/workflows/ifpen_devenv_2021b.yml

@@ -46,7 +46,7 @@ env:
   CT_OPTS: "--timeout 300 --output-on-failure"
 
 jobs:
-  build:
+  build :
     name: ${{matrix.config.name}}
     runs-on: ubuntu-latest
     timeout-minutes: 120

CHANGELOG.md

@@ -18,8 +18,7 @@ All notable changes to this project will be documented in this file.
 
 - \[move\]: add a `clone()` method to `MatrixData` and `VectorData`
 - \[core\]: dramatic improvement of `DoK` performance
-- \[core\]: `Redistributor` object must be built from an
-  allocated `MessagePassingMng`
+- \[core\]: `Redistributor` object must be built from an allocated `MessagePassingMng`
 - \[trilinos\]: new wrapper for trilinos library (belos + ifpack2 + tpetra)
 - \[hypre\]: GPU support.
 
@@ -39,16 +38,14 @@ All notable changes to this project will be documented in this file.
 
 **Changes:**
 
-- plugins are now part of Alien distribution. That means that
-  only `find_package(Alien)` is necessary.
+- plugins are now part of Alien distribution. That means that only `find_package(Alien)` is necessary.
 
 ## 1.1.1
 
 **Fixed bugs:**
 
 - \[core, hypre, petsc\]: fix CMake export files
-- \[petsc\]: internal call to PetscInitialize (
-  fixes [issue#14](https://github.com/arcaneframework/alien/issues/14))
+- \[petsc\]: internal call to PetscInitialize (fixes [issue#14](https://github.com/arcaneframework/alien/issues/14))
 
 **Changes:**
 
@@ -66,5 +63,4 @@ All notable changes to this project will be documented in this file.
 
 - switch to mono-repo for all Alien related projects
 - `move` api is now in `Alien::Move` namespace
-- Setting CMake parameter `ALIEN_DEFAULT_OPTIONS` to `OFF` disable all optional
-  external dependencies
+- Setting CMake parameter `ALIEN_DEFAULT_OPTIONS` to `OFF` disable all optional external dependencies

CMake/syclcc-launcher

@@ -37,40 +37,40 @@ CXX_COMPILER_ARG = '--launcher-cxx-compiler='
 SYCLCC_ARG = '--launcher-syclcc='
 
 if __name__ == '__main__':
-    syclcc_specific_args = []
-    command_offset = None
-    cxx_compiler_exe = None
-    syclcc_exe = None
-    for command_offset, arg in enumerate(sys.argv[1:], 1):
-        if arg.startswith(CXX_COMPILER_ARG):
-            cxx_compiler_exe = arg[len(CXX_COMPILER_ARG):]
-        elif arg.startswith(SYCLCC_ARG):
-            # Split by non-path char, as on Windows it is required to run python path/to/syclcc,
-            # instead of just syclcc. As we need "python" and "syclcc" two different array elements
-            # in the config, a '*' is used to seperate those two elements.
-            syclcc_exe = arg[len(SYCLCC_ARG):].split("*")
-        elif arg == '--':
-            command_offset += 1
-            break
-        elif arg.startswith('-'):
-            syclcc_specific_args.append(arg)
-        else:
-            break
+  syclcc_specific_args = []
+  command_offset = None
+  cxx_compiler_exe = None
+  syclcc_exe = None
+  for command_offset, arg in enumerate(sys.argv[1:], 1):
+    if arg.startswith(CXX_COMPILER_ARG):
+      cxx_compiler_exe = arg[len(CXX_COMPILER_ARG):]
+    elif arg.startswith(SYCLCC_ARG):
+      # Split by non-path char, as on Windows it is required to run python path/to/syclcc,
+      # instead of just syclcc. As we need "python" and "syclcc" two different array elements
+      # in the config, a '*' is used to seperate those two elements.
+      syclcc_exe = arg[len(SYCLCC_ARG):].split("*")
+    elif arg == '--':
+      command_offset += 1
+      break
+    elif arg.startswith('-'):
+      syclcc_specific_args.append(arg)
+    else:
+      break
 
-    if cxx_compiler_exe is None or syclcc_exe is None or command_offset is None or command_offset + 1 >= len(sys.argv) \
-            or '--help' in syclcc_specific_args:
-        print('Usage: {} {}<path> {}<path> [syclcc-specific-args...] '
-              'command [command-args...]'.format(sys.argv[0], CXX_COMPILER_ARG, SYCLCC_ARG), file=sys.stderr)
-        sys.exit(1)
+  if cxx_compiler_exe is None or syclcc_exe is None or command_offset is None or command_offset + 1 >= len(sys.argv) \
+      or '--help' in syclcc_specific_args:
+    print('Usage: {} {}<path> {}<path> [syclcc-specific-args...] '
+          'command [command-args...]'.format(sys.argv[0], CXX_COMPILER_ARG, SYCLCC_ARG), file=sys.stderr)
+    sys.exit(1)
 
-    command_in = sys.argv[command_offset]
-    command_in_args = sys.argv[command_offset + 1:]
+  command_in = sys.argv[command_offset]
+  command_in_args = sys.argv[command_offset + 1:]
 
-    # When invoked with a command line for expected compiler (e.g. clang++), replace with a syclcc invocation.
-    # Otherwise, e.g. for invocations of `ar` for linking static libraries, just continue with the command as-is.
-    if os.path.samefile(cxx_compiler_exe, command_in):
-        command_line = [*syclcc_exe, *syclcc_specific_args, *command_in_args]
-    else:
-        command_line = [command_in, *command_in_args]
+  # When invoked with a command line for expected compiler (e.g. clang++), replace with a syclcc invocation.
+  # Otherwise, e.g. for invocations of `ar` for linking static libraries, just continue with the command as-is.
+  if os.path.samefile(cxx_compiler_exe, command_in):
+    command_line = [*syclcc_exe, *syclcc_specific_args, *command_in_args]
+  else:
+    command_line = [command_in, *command_in_args]
 
-    sys.exit(subprocess.run(command_line).returncode)
+  sys.exit(subprocess.run(command_line).returncode)

CMakePresets.json

@@ -23,6 +23,7 @@
     {
       "name": "full",
       "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/full",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
@@ -55,6 +56,7 @@
     {
       "name": "dev-debug",
       "inherits": "dev-full",
+      "binaryDir": "${sourceDir}/build/debug",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "ALIEN_EXPAND_TESTS": "ON"

benchmark/src/alien/benchmark/MatrixMarketProblem.cpp

@@ -39,7 +39,7 @@ MatrixMarketProblem::MatrixMarketProblem(Arccore::MessagePassing::IMessagePassin
 , m_rhs(m_matrix.distribution().rowDistribution())
 {
   Alien::Move::LocalVectorWriter v_builder = std::move(m_rhs);
-  for (int i = 0; i < v_builder.size(); i++) {
+  for (int i = 0 ; i < v_builder.size() ; i++) {
     v_builder[i] = 1.0;
   }
   m_rhs = v_builder.release();
@@ -55,6 +55,7 @@ Alien::Move::VectorData MatrixMarketProblem::vector() const
   return m_rhs.clone();
 }
 
+
 std::unique_ptr<ILinearProblem> buildFromMatrixMarket(Arccore::MessagePassing::IMessagePassingMng* pm, const std::string& matrix_name, const std::string& rhs_name)
 {
   if (rhs_name == "") {