Merged with master

kaajalbgupta · kaajalbgupta · commit 874853ca2eb1 · 2024-08-08T14:02:10.000+05:30
diff --git a/meson_options.txt b/meson_options.txt
@@ -6,5 +6,5 @@ option('enso_pipe_size', type: 'integer', min: 0, max: 32768, value: 32768,
        description: 'Buffer size used by each software enso pipe')
 option('latency_opt', type: 'boolean', value: true,
        description: 'Optimize for latency')
-option('dev_backend', type: 'combo', choices: ['intel_fpga', 'software', 'hybrid'],
+option('dev_backend', type: 'combo', choices: ['intel_fpga', 'hybrid'],
        value: 'intel_fpga', description: 'Device backend to use')
diff --git a/software/include/enso/queue.h b/software/include/enso/queue.h
@@ -256,7 +256,7 @@ class Queue {
     }
 
     if (!join_if_exists && !create_queue) {
-      std::cerr << "Queue already exists!!" << std::endl;
+      std::cerr << "Queue already exists" << std::endl;
       return -1;
     }
 
diff --git a/software/meson.build b/software/meson.build
@@ -1,7 +1,5 @@
 if dev_backend == 'intel_fpga'
     library_name = 'enso'
-elif dev_backend == 'software'
-    library_name = 'enso_sw'
 elif dev_backend == 'hybrid'
     library_name = 'enso_hybrid'
 else

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ class Queue {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`if (!join_if_exists && !create_queue) {`
`259`		`- std::cerr << "Queue already exists!!" << std::endl;`
	`259`	`+ std::cerr << "Queue already exists" << std::endl;`
`260`	`260`	`return -1;`
`261`	`261`	`}`
`262`	`262`