Skip to content

Commit

Permalink
The name was changed from Altair Grid Engine to Grid Engine.
Browse files Browse the repository at this point in the history
  • Loading branch information
mnakao committed Feb 12, 2025
1 parent be1e0ac commit b39d8bc
Show file tree
Hide file tree
Showing 11 changed files with 5,647 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## [1.3.0] - 2025-02-12

### Added
- Support Altair Grid Engine job scheduler.
- Support Grid Engine job scheduler.
- It is possible to define headers for each application.
- For pre-processing, submit section in form.yml is added. And delete submit.yml.
- Added the ability to change the script label.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Open Composer is a web application to generate batch job scripts and submit batc
## Supported job scheduler
- Slurm
- PBS Pro
- Altair Grid Engine (AGE)
- Grid Engine
- Fujitsu_TCS

## Demo
Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Save Open Composer in your Open OnDemand application directory: `/var/www/ood/ap
## Open Composer configuration
Edit `./OpenComposer/conf.yml.erb`.
All fields except `scheduler` and `apps_dir` can be omitted.
However, if you select `age` for `scheduler`, you need to set `sge_root`.
However, if you select `sge` for `scheduler`, you need to set `sge_root`.

| Item name | Setting |
| ---- | ---- |
| scheduler | Job scheduler (`slurm`, `pbspro`, `age` or `fujitsu_tcs`) |
| scheduler | Job scheduler (`slurm`, `pbspro`, `sge` or `fujitsu_tcs`) |
| apps_dir | Application directory |
| login_node | Login node when you launch the Open OnDemand web terminal |
| data_dir | Directory where submitted job information is stored |
Expand Down Expand Up @@ -51,7 +51,7 @@ bin_overrides:
qdel: "/usr/local/bin/qdel"
```

If the job scheduler is `age`, set `qsub`, `qstat`, `qdel`, and `qacct` as follows.
If the job scheduler is `sge`, set `qsub`, `qstat`, `qdel`, and `qacct` as follows.

```
bin_overrides:
Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL_ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Open Composerは[Open OnDemand](https://openondemand.org/)上で動作します
```

## Open Composerの設定
`./OpenComposer/conf.yml.erb`を編集してください。`scheduler``apps_dir`以外は省略可能です。ただし、`scheduler``age`を選択した場合は、`sge_root`の設定が必要です。
`./OpenComposer/conf.yml.erb`を編集してください。`scheduler``apps_dir`以外は省略可能です。ただし、`scheduler``sge`を選択した場合は、`sge_root`の設定が必要です。

| 項目名 | 設定内容 |
| ---- | ---- |
| scheduler | 利用するスケジューラ(`slurm``pbspro``age``fujitsu_tcs`|
| scheduler | 利用するスケジューラ(`slurm``pbspro``sge``fujitsu_tcs`|
| apps_dir | アプリケーションのディレクトリ |
| login_node | Open OnDemandのWebターミナルを起動した際のログイン先 |
| data_dir | 投入したジョブの情報のディレクトリ |
Expand Down Expand Up @@ -48,7 +48,7 @@ bin_overrides:
qdel: "/usr/local/bin/qdel"
```

ジョブスケジューラが`age`の場合は、`qsub``qstat``qdel``qacct`を設定します。
ジョブスケジューラが`sge`の場合は、`qsub``qstat``qdel``qacct`を設定します。

```
bin_overrides:
Expand Down
10 changes: 5 additions & 5 deletions lib/schedulers/age.rb → lib/schedulers/sge.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# This program was based on the following specifications:
# https://2022.help.altair.com/2022.1.0/AltairGridEngine/AdminsGuideGE.pdf
class Age < Scheduler
# Submit a job to Altair Grid Engine using the 'qsub' command.
class Sge < Scheduler
# Submit a job to Grid Engine using the 'qsub' command.
def submit(script_path, job_name = nil, added_options = nil, bin = nil, bin_overrides = nil, ssh_wrapper = nil)
init_bash_path = "/usr/share/Modules/init/bash"
init_bash = "source #{init_bash_path};" if File.exist?(init_bash_path) && ssh_wrapper.nil?
Expand Down Expand Up @@ -31,7 +31,7 @@ def submit(script_path, job_name = nil, added_options = nil, bin = nil, bin_over
return nil, e.message
end

# Cancel one or more jobs in Altair Grid Engine using the 'qdel' command.
# Cancel one or more jobs in Grid Engine using the 'qdel' command.
def cancel(jobs, bin = nil, bin_overrides = nil, ssh_wrapper = nil)
qdel = get_command_path("qdel", bin, bin_overrides)
transformed_jobs = jobs.map do |job_id|
Expand Down Expand Up @@ -65,7 +65,7 @@ def parse_block(block)
end
end

# Query the status of one or more jobs in Altair Grid Engine using 'qstat'.
# Query the status of one or more jobs in Grid Engine using 'qstat'.
# It retrieves job details such as submission time, partition, and status.
def query(jobs, bin = nil, bin_overrides = nil, ssh_wrapper = nil)
# r : Running
Expand Down Expand Up @@ -159,7 +159,7 @@ def query(jobs, bin = nil, bin_overrides = nil, ssh_wrapper = nil)
remaining_jobs = jobs.reject { |id| info.key?(id) }
return info, nil if remaining_jobs.empty?

# Retrieve completed jobs using to Altair Grid Engine using the 'qacct' command.
# Retrieve completed jobs using to Grid Engine using the 'qacct' command.
# Updates the information of specified jobs that were completed within the past week from today.
# If the job was completed more than a week ago, only the status is set to JOB_STATUS["completed"].
qacct = get_command_path("qacct", bin, bin_overrides)
Expand Down
Binary file removed sample_apps/AltairGridEngine/logo.png
Binary file not shown.
5 changes: 0 additions & 5 deletions sample_apps/AltairGridEngine/manifest.yml

This file was deleted.

File renamed without changes.
Loading

0 comments on commit b39d8bc

Please sign in to comment.