From 9b0204ccd49b2e01c6b5690eaedefd3d06e5ae78 Mon Sep 17 00:00:00 2001 From: zhouqunjie <450705171@qq.com> Date: Mon, 24 Oct 2022 03:31:58 -0700 Subject: [PATCH] config & code restructure --- .../cgo/example/extra/cancel_job.go | 6 +- .../cgo/example/extra/get_job_account_info.go | 6 +- .../cgo/src/slurm/extra/slurm_extra.go | 3 +- slurm/cgo/src/slurm/submitjob/submit_job.go | 83 ------------------- 4 files changed, 10 insertions(+), 88 deletions(-) rename {slurm => adaptor/pcm_slurm}/cgo/example/extra/cancel_job.go (76%) rename {slurm => adaptor/pcm_slurm}/cgo/example/extra/get_job_account_info.go (83%) rename {slurm => adaptor/pcm_slurm}/cgo/src/slurm/extra/slurm_extra.go (95%) delete mode 100644 slurm/cgo/src/slurm/submitjob/submit_job.go diff --git a/slurm/cgo/example/extra/cancel_job.go b/adaptor/pcm_slurm/cgo/example/extra/cancel_job.go similarity index 76% rename from slurm/cgo/example/extra/cancel_job.go rename to adaptor/pcm_slurm/cgo/example/extra/cancel_job.go index d3362e7a..749f2af4 100644 --- a/slurm/cgo/example/extra/cancel_job.go +++ b/adaptor/pcm_slurm/cgo/example/extra/cancel_job.go @@ -1,7 +1,9 @@ package main -import "slurm/extra" -import "fmt" +import ( + "code.gitlink.org.cn/JCCE/PCM.git/adaptor/pcm_slurm/cgo/src/slurm/extra" + "fmt" +) import "os" import "strconv" diff --git a/slurm/cgo/example/extra/get_job_account_info.go b/adaptor/pcm_slurm/cgo/example/extra/get_job_account_info.go similarity index 83% rename from slurm/cgo/example/extra/get_job_account_info.go rename to adaptor/pcm_slurm/cgo/example/extra/get_job_account_info.go index b70aa343..8fa3cbc8 100644 --- a/slurm/cgo/example/extra/get_job_account_info.go +++ b/adaptor/pcm_slurm/cgo/example/extra/get_job_account_info.go @@ -1,7 +1,9 @@ package main -import "slurm/extra" -import "fmt" +import ( + "code.gitlink.org.cn/JCCE/PCM.git/adaptor/pcm_slurm/cgo/src/slurm/extra" + "fmt" +) import "os" import "strconv" diff --git a/slurm/cgo/src/slurm/extra/slurm_extra.go b/adaptor/pcm_slurm/cgo/src/slurm/extra/slurm_extra.go similarity index 95% rename from slurm/cgo/src/slurm/extra/slurm_extra.go rename to adaptor/pcm_slurm/cgo/src/slurm/extra/slurm_extra.go index 2c3fa7dc..d8dd9a78 100644 --- a/slurm/cgo/src/slurm/extra/slurm_extra.go +++ b/adaptor/pcm_slurm/cgo/src/slurm/extra/slurm_extra.go @@ -4,12 +4,13 @@ package extra import ( + "code.gitlink.org.cn/JCCE/PCM.git/adaptor/pcm_slurm/cgo/src/slurm" + job_info "code.gitlink.org.cn/JCCE/PCM.git/adaptor/pcm_slurm/cgo/src/slurm/jobinfo" "errors" "fmt" "os" "os/exec" "path/filepath" - "slurm" "strconv" "strings" ) diff --git a/slurm/cgo/src/slurm/submitjob/submit_job.go b/slurm/cgo/src/slurm/submitjob/submit_job.go deleted file mode 100644 index 7f6552b5..00000000 --- a/slurm/cgo/src/slurm/submitjob/submit_job.go +++ /dev/null @@ -1,83 +0,0 @@ -package submit_job - -/* -#cgo LDFLAGS: -lslurm -#include -#include -#include -#include -#include -int submit() { - int error_code, i, count; - job_desc_msg_t job_mesg; - submit_response_msg_t *resp_msg; - char *env[2]; - - slurm_init_job_desc_msg( &job_mesg ); - job_mesg. contiguous = 1; - job_mesg. name = ("job01"); - job_mesg. min_cpus = 1; - job_mesg. pn_min_memory = 100; - job_mesg. pn_min_tmp_disk = 200; - job_mesg. priority = 100; - job_mesg. shared = 0; - job_mesg. time_limit = 100; - job_mesg. min_nodes = 1; - job_mesg. user_id = getuid(); - job_mesg. script = "#!/bin/csh\n/bin/hostname\n"; - job_mesg. std_err = "/tmp/slurm.stderr"; - job_mesg. std_in = "/tmp/slurm.stdin"; - job_mesg. std_out = "/tmp/slurm.stdout"; - job_mesg. work_dir = "/tmp\0"; - job_mesg. env_size = 2; - env[0] = "SLURM_ENV_0=looking_good"; - env[1] = "SLURM_ENV_1=still_good"; - job_mesg. environment = env; - - error_code = slurm_submit_batch_job( &job_mesg, &resp_msg ); - if (error_code) { - slurm_perror ("slurm_submit_batch_job"); - return (error_code); - } - else { - printf ("job %u submitted\n", resp_msg->job_id); - slurm_free_submit_response_response_msg ( resp_msg ); - } - - //if (argc > 1) - // count = atoi (argv[1]); - //else - // count = 1; - // - //for (i=1; ijob_id); - // slurm_free_submit_response_response_msg ( resp_msg ); - // } - //} - exit (error_code); -} - -*/ -import "C" - -func TestSubmit() { - C.submit() -}