return self.send(param)
end
end
- redirect_to :back
+ redirect_back(fallback_location: root_path)
end
expose_action :copy_selections_into_project do
respond_to do |f|
f.json { render json: @object }
f.html {
- redirect_to(params[:return_to] || :back)
+ if params[:return_to]
+ redirect_to(params[:return_to])
+ else
+ redirect_back(fallback_location: root_path)
+ end
}
f.js { render }
end
redirect_to arvados_api_client.arvados_login_url(return_to: strip_token_from_path(request.url))
else
flash[:error] = "Either you are not logged in, or your session has timed out. I can't automatically log you in and re-attempt this request."
- redirect_to :back
+ redirect_back(fallback_location: root_path)
end
false # For convenience to return from callbacks
end
def index
if unsigned_user_agreements.empty?
- redirect_to(params[:return_to] || :back)
+ if params[:return_to]
+ redirect_to(params[:return_to])
+ else
+ redirect_back(fallback_location: root_path)
+ end
end
end
end
end
current_user.activate
- redirect_to(params[:return_to] || :back)
+ if params[:return_to]
+ redirect_to(params[:return_to])
+ else
+ redirect_back(fallback_location: root_path)
+ end
end
end
{% endcomment %}
{% if site.current_version and site.current_version != 'main' %}
-{% assign branchname = site.current_version | slice: 0, 3 | append: '-dev' %}
+{% assign branchname = site.current_version | slice: 1, 3 | append: '-release' %}
{% else %}
{% assign branchname = 'main' %}
{% endif %}
h2(#vagrant). Vagrant
-This is a package-based installation method. The Salt scripts are available from the "tools/salt-install":https://github.com/arvados/arvados/tree/main/tools/salt-install directory in the Arvados git repository.
+{% include 'branchname' %}
+
+This is a package-based installation method. Start by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The Salt scripts are available in the @tools/salt-install@ directory.
A @Vagrantfile@ is provided to install Arvados in a virtual machine on your computer using "Vagrant":https://www.vagrantup.com/.
property2: $(inputs.value2)
arv:CUDARequirement:
- minCUDADriverVersion: "11.0"
- minCUDAHardwareCapability: "9.0"
- minDeviceCount: 1
- maxDeviceCount: 1
+ cudaVersionMin: "11.0"
+ cudaComputeCapabilityMin: "9.0"
+ deviceCountMin: 1
+ deviceCountMax: 1
{% endcodeblock %}
h2(#RunInSingleContainer). arv:RunInSingleContainer
table(table table-bordered table-condensed).
|_. Field |_. Type |_. Description |
-|minCUDADriverVersion|string|Required. The CUDA SDK version corresponding to the minimum driver version supported by the container (generally, the SDK version 'X.Y' the application was compiled against).|
-|minCUDAHardwareCapability|string|Required. The minimum CUDA hardware capability (in 'X.Y' format) required by the application's PTX or C++ GPU code (will be JIT compiled for the available hardware).|
-|minDeviceCount|integer|Minimum number of GPU devices to allocate on a single node. Required.|
-|maxDeviceCount|integer|Maximum number of GPU devices to allocate on a single node. Optional. If not specified, same as @minDeviceCount@.|
+|cudaVersionMin|string|Required. The CUDA SDK version corresponding to the minimum driver version supported by the container (generally, the SDK version 'X.Y' the application was compiled against).|
+|cudaComputeCapabilityMin|string|Required. The minimum CUDA hardware capability (in 'X.Y' format) required by the application's PTX or C++ GPU code (will be JIT compiled for the available hardware).|
+|deviceCountMin|integer|Minimum number of GPU devices to allocate on a single node. Required.|
+|deviceCountMax|integer|Maximum number of GPU devices to allocate on a single node. Optional. If not specified, same as @minDeviceCount@.|
h2. arv:dockerCollectionPDH
"http://arvados.org/cwl#ClusterTarget",
"http://arvados.org/cwl#OutputStorageClass",
"http://arvados.org/cwl#ProcessProperties",
- "http://arvados.org/cwl#CUDARequirement"
+ "http://commonwl.org/cwltool#CUDARequirement"
])
def exit_signal_handler(sigcode, frame):
mapPredicate: propertyValue
-- name: CUDARequirement
+- name: cwltool:CUDARequirement
type: record
extends: cwl:ProcessRequirement
inVocab: false
doc: |
- Require support for Nvidia CUDA (GPU hardware acceleration).
+ Require support for NVIDA CUDA (GPU hardware acceleration).
fields:
class:
type: string
- doc: 'arv:CUDARequirement'
+ doc: 'cwltool:CUDARequirement'
jsonldPredicate:
_id: "@type"
_type: "@vocab"
- minCUDADriverVersion:
+ cudaVersionMin:
type: string
- doc: Minimum CUDA driver version to run the software, in X.Y format of the associated CUDA SDK release.
- minCUDAHardwareCapability:
+ doc: |
+ Minimum CUDA version to run the software, in X.Y format. This
+ corresponds to a CUDA SDK release. When running directly on
+ the host (not in a container) the host must have a compatible
+ CUDA SDK (matching the exact version, or, starting with CUDA
+ 11.3, matching major version). When run in a container, the
+ container image should provide the CUDA runtime, and the host
+ driver is injected into the container. In this case, because
+ CUDA drivers are backwards compatible, it is possible to
+ use an older SDK with a newer driver across major versions.
+
+ See https://docs.nvidia.com/deploy/cuda-compatibility/ for
+ details.
+ cudaComputeCapabilityMin:
type: string
doc: Minimum CUDA hardware capability required to run the software, in X.Y format.
- minDeviceCount:
+ deviceCountMin:
type: int?
default: 1
- doc: Minimum number of GPU devices to request, or 1.
- maxDeviceCount:
+ doc: Minimum number of GPU devices to request, default 1.
+ deviceCountMax:
type: int?
- doc: Maximum number of GPU devices to request. If not specified, same as `minDeviceCount`.
+ doc: Maximum number of GPU devices to request. If not specified, same as `deviceCountMin`.
mapPredicate: propertyValue
-- name: CUDARequirement
+- name: cwltool:CUDARequirement
type: record
extends: cwl:ProcessRequirement
inVocab: false
doc: |
- Require support for Nvidia CUDA (GPU hardware acceleration).
+ Require support for NVIDA CUDA (GPU hardware acceleration).
fields:
class:
type: string
- doc: 'arv:CUDARequirement'
+ doc: 'cwltool:CUDARequirement'
jsonldPredicate:
_id: "@type"
_type: "@vocab"
- minCUDADriverVersion:
+ cudaVersionMin:
type: string
- doc: Minimum CUDA driver version to run the software, in X.Y format of the associated CUDA SDK release.
- minCUDAHardwareCapability:
+ doc: |
+ Minimum CUDA version to run the software, in X.Y format. This
+ corresponds to a CUDA SDK release. When running directly on
+ the host (not in a container) the host must have a compatible
+ CUDA SDK (matching the exact version, or, starting with CUDA
+ 11.3, matching major version). When run in a container, the
+ container image should provide the CUDA runtime, and the host
+ driver is injected into the container. In this case, because
+ CUDA drivers are backwards compatible, it is possible to
+ use an older SDK with a newer driver across major versions.
+
+ See https://docs.nvidia.com/deploy/cuda-compatibility/ for
+ details.
+ cudaComputeCapabilityMin:
type: string
doc: Minimum CUDA hardware capability required to run the software, in X.Y format.
- minDeviceCount:
+ deviceCountMin:
type: int?
default: 1
- doc: Minimum number of GPU devices to request, or 1.
- maxDeviceCount:
+ doc: Minimum number of GPU devices to request, default 1.
+ deviceCountMax:
type: int?
- doc: Maximum number of GPU devices to request. If not specified, same as `minDeviceCount`.
+ doc: Maximum number of GPU devices to request. If not specified, same as `deviceCountMin`.
mapPredicate: propertyValue
-- name: CUDARequirement
+- name: cwltool:CUDARequirement
type: record
extends: cwl:ProcessRequirement
inVocab: false
doc: |
- Require support for Nvidia CUDA (GPU hardware acceleration).
+ Require support for NVIDA CUDA (GPU hardware acceleration).
fields:
class:
type: string
- doc: 'arv:CUDARequirement'
+ doc: 'cwltool:CUDARequirement'
jsonldPredicate:
_id: "@type"
_type: "@vocab"
- minCUDADriverVersion:
+ cudaVersionMin:
type: string
- doc: Minimum CUDA driver version to run the software, in X.Y format of the associated CUDA SDK release.
- minCUDAHardwareCapability:
+ doc: |
+ Minimum CUDA version to run the software, in X.Y format. This
+ corresponds to a CUDA SDK release. When running directly on
+ the host (not in a container) the host must have a compatible
+ CUDA SDK (matching the exact version, or, starting with CUDA
+ 11.3, matching major version). When run in a container, the
+ container image should provide the CUDA runtime, and the host
+ driver is injected into the container. In this case, because
+ CUDA drivers are backwards compatible, it is possible to
+ use an older SDK with a newer driver across major versions.
+
+ See https://docs.nvidia.com/deploy/cuda-compatibility/ for
+ details.
+ cudaComputeCapabilityMin:
type: string
doc: Minimum CUDA hardware capability required to run the software, in X.Y format.
- minDeviceCount:
+ deviceCountMin:
type: int?
default: 1
- doc: Minimum number of GPU devices to request, or 1.
- maxDeviceCount:
+ doc: Minimum number of GPU devices to request, default 1.
+ deviceCountMax:
type: int?
- doc: Maximum number of GPU devices to request. If not specified, same as `minDeviceCount`.
+ doc: Maximum number of GPU devices to request. If not specified, same as `deviceCountMin`.
else:
container_request["output_storage_classes"] = runtimeContext.intermediate_storage_classes.strip().split(",")
- cuda_req, _ = self.get_requirement("http://arvados.org/cwl#CUDARequirement")
+ cuda_req, _ = self.get_requirement("http://commonwl.org/cwltool#CUDARequirement")
if cuda_req:
runtime_constraints["cuda"] = {
- "device_count": cuda_req.get("minDeviceCount", 1),
- "driver_version": cuda_req["minCUDADriverVersion"],
- "hardware_capability": cuda_req["minCUDAHardwareCapability"]
+ "device_count": cuda_req.get("deviceCountMin", 1),
+ "driver_version": cuda_req["cudaVersionMin"],
+ "hardware_capability": cuda_req["cudaComputeCapabilityMin"]
}
if self.timelimit is not None and self.timelimit > 0:
"id": "",
"cwlVersion": "v1.2",
"class": "CommandLineTool",
- "hints": [
+ "requirements": [
{
- "class": "http://arvados.org/cwl#CUDARequirement",
- "minCUDADriverVersion": "11.0",
- "minCUDAHardwareCapability": "9.0",
+ "class": "http://commonwl.org/cwltool#CUDARequirement",
+ "cudaVersionMin": "11.0",
+ "cudaComputeCapabilityMin": "9.0",
}
]
})
projects / arvados.git / commitdiff