Skip to content

Commit

Permalink
Change minor references to platforms and one grammatical mistake (#568)
Browse files Browse the repository at this point in the history
  • Loading branch information
Grifs authored Oct 13, 2023
1 parent 6afbc30 commit 94a8b6b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/main/scala/io/viash/engines/NativeEngine.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import io.viash.schemas._
"yaml")
@subclass("native")
final case class NativeEngine(
@description("Name of the engine. As with all engines, you can give a engine a different name. By specifying `id: foo`, you can target this engine (only) by specifying `...` in any of the Viash commands.")
@description("Name of the engine. As with all engines, you can give an engine a different name. By specifying `id: foo`, you can target this engine (only) by specifying `...` in any of the Viash commands.")
@example("id: foo", "yaml")
@default("native")
id: String = "native",
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/io/viash/runners/NextflowRunner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@ final case class NextflowRunner(

if (mainScript.isInstanceOf[Executable]) {
throw new NotImplementedError(
"Running executables through a NextflowPlatform is not (yet) implemented. " +
"Running executables through a NextflowRunner is not (yet) implemented. " +
"Create a support ticket to request this functionality if necessary."
)
}

/************************* MAIN.NF *************************/

val directivesToJson = directives.copy(
// if a docker platform is defined but the directives.container isn't, use the image of the dockerplatform as default
// if a docker engine is defined but the directives.container isn't, use the image of the docker engine as default
container = directives.container orElse containerDirective.map(cd => Left(cd.toMap)),
// is memory requirements are defined but directives.memory isn't, use that instead
memory = directives.memory orElse config.functionality.requirements.memoryAsBytes.map(_.toString + " B"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ object NextflowHelper {

def renderDependencies(config: Config): String = {
// TODO ideally we'd already have 'thisPath' precalculated but until that day, calculate it here
val thisPath = Paths.get(ViashNamespace.targetOutputPath("", "invalid_platform_name", config.functionality.namespace, config.functionality.name))
// The name of the runner doesn't really matter here as it is just used to generate the relative location, and we don't have access to it anyway.
val thisPath = Paths.get(ViashNamespace.targetOutputPath("", "invalid_runner_name", config.functionality.namespace, config.functionality.name))

val depStrs = config.functionality.dependencies.map{ dep =>
NextflowHelper.renderInclude(dep, thisPath)
Expand Down

0 comments on commit 94a8b6b

Please sign in to comment.