Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a few minor typos #49

Merged
merged 2 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ For example, computing allowed token set in the 32000-strong vocabulary of Llama

- about 2.0ms for Yacc grammar of the C programming language
- about 0.3ms for a regular expression
- about 0.2ms for a substring contraint, from 4kB string
- about 0.2ms for a substring constraint, from 4kB string

The above numbers are for a single sequence, however each sequence is processed in separate process,
and thus if there is more cores than sequences (which is typical), they do not change.
Expand Down
2 changes: 1 addition & 1 deletion aici_abi/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# aici_abi

This crate specifies the application binary inferface (ABI) for the AICI Controllers.
This crate specifies the application binary interface (ABI) for the AICI Controllers.
It also provides higher-level interfaces for implementing controllers.

## Low-level interface
Expand Down
4 changes: 2 additions & 2 deletions aicirt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub use fxhash::FxHashSet as HashSet;
pub enum LogMode {
Normal,
Test,
Deamon,
Daemon,
}

fn daemon_format(
Expand All @@ -47,7 +47,7 @@ pub fn init_log(mode: LogMode) -> Result<()> {
LogMode::Test => {
Logger::try_with_env_or_str("debug")?.write_mode(WriteMode::SupportCapture)
}
LogMode::Deamon => Logger::try_with_env_or_str("info")?
LogMode::Daemon => Logger::try_with_env_or_str("info")?
.format(daemon_format)
.log_to_stdout(),
};
Expand Down
4 changes: 2 additions & 2 deletions declctrl/src/declctrl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ impl StepState {
let sidx = runner.bytes.len() - nbytes;

for idx in sidx.saturating_sub(1)..runner.bytes.len().saturating_sub(1) {
if !is_boundry(runner.bytes[idx]) && is_boundry(runner.bytes[idx + 1]) {
if !is_boundary(runner.bytes[idx]) && is_boundary(runner.bytes[idx + 1]) {
self.num_words += 1;
break;
}
Expand Down Expand Up @@ -828,7 +828,7 @@ impl StepState {

return None;

fn is_boundry(b: u8) -> bool {
fn is_boundary(b: u8) -> bool {
b == b' ' || b == b'\n' || b == b'\t'
}
}
Expand Down
2 changes: 1 addition & 1 deletion jsctrl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and use the native constraints.

This is quite similar to [PyCtrl](../pyctrl/README.md) but with JavaScript instead of Python.
It is also smaller, at 1.3MiB without regex and CFG, 1.8MiB with regex, and 3.3MiB with regex and CFG.
For comparision, pyctrl is 14MiB.
For comparison, pyctrl is 14MiB.
Also, the [PyCtrl samples](../pyctrl/samples/) translate 1:1 to JsCtrl.

## Usage
Expand Down
6 changes: 3 additions & 3 deletions pyaici/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def infer_args(cmd: argparse.ArgumentParser):
cmd.add_argument(
"--temperature",
type=float,
help="temperature for sampling; deflaut 0.0 (argmax)",
help="temperature for sampling; default 0.0 (argmax)",
)


Expand Down Expand Up @@ -306,8 +306,8 @@ def main_inner():

jsinit_cmd = subparsers.add_parser(
"jsinit",
help="intialize current folder for jsctrl",
description="Intialize a JavaScript/TypeScript folder for jsctrl.",
help="initialize current folder for jsctrl",
description="Initialize a JavaScript/TypeScript folder for jsctrl.",
)
jsinit_cmd.add_argument(
"--force", "-f", action="store_true", help="overwrite existing files"
Expand Down
2 changes: 1 addition & 1 deletion pyaici/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ async def wrap():
class Label:
def __init__(self):
"""
Create a new label the indictes the current position in the sequence.
Create a new label the indicates the current position in the sequence.
Can be passed as `following=` argument to `FixedTokens()`.
"""
self.ptr = len(get_tokens())
Expand Down
2 changes: 1 addition & 1 deletion pyaici/server_native.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def eos_token() -> int:
class TokenSet(Sequence[bool]):
"""
Represents a set of tokens.
The value is true at indicies corresponding to tokens in the set.
The value is true at indices corresponding to tokens in the set.
"""

def __init__(self):
Expand Down
4 changes: 2 additions & 2 deletions rllm-cuda/scripts/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _remove_duplicate_names(

keep_name = sorted(list(complete_names))[0]

# Mecanism to preferentially select keys to keep
# Mechanism to preferentially select keys to keep
# coming from the on-disk file to allow
# loading models saved with a different choice
# of keep_name
Expand Down Expand Up @@ -99,7 +99,7 @@ def get_discard_names(model_id: str, revision: Optional[str], folder: str, token

class_ = getattr(transformers, architecture)

# Name for this varible depends on transformers version.
# Name for this variable depends on transformers version.
discard_names = getattr(class_, "_tied_weights_keys", [])

except Exception:
Expand Down
4 changes: 2 additions & 2 deletions rllm-cuda/src/paged/blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl BlockRef {
}
}

pub fn is_singlular(&self) -> bool {
pub fn is_singular(&self) -> bool {
let mut alloc = self.allocator.lock().unwrap();
let blk = &mut alloc.all_blocks[self.block_idx];
assert!(blk.ref_count > 0);
Expand Down Expand Up @@ -206,7 +206,7 @@ impl BlockSpaceManager {
let block_idx = ptr / self.block_size;
if block_idx < block_table.len() {
let curr_block = &mut block_table[block_idx];
if !curr_block.is_singlular() {
if !curr_block.is_singular() {
let new_block = self.alloc_gpu();
let old_block_number = curr_block.block_idx;
let new_block_number = new_block.block_idx;
Expand Down
2 changes: 1 addition & 1 deletion rllm-cuda/src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ pub async fn server_main(mut args: RllmCliArgs) -> () {
None => {}
}
aicirt::init_log(if args.daemon {
aicirt::LogMode::Deamon
aicirt::LogMode::Daemon
} else {
aicirt::LogMode::Normal
})
Expand Down
4 changes: 2 additions & 2 deletions tch-cuda/kernels/flash_attn/flash_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ mha_fwd(at::Tensor &q, // batch_size x seqlen_q x num_heads x head_size
const int head_size_og = sizes[3];
const int seqlen_k = k.size(1);
const int num_heads_k = k.size(2);
TORCH_CHECK(batch_size > 0, "batch size must be postive");
TORCH_CHECK(batch_size > 0, "batch size must be positive");
TORCH_CHECK(head_size_og <= 256, "FlashAttention forward only supports head dimension at most 256");
TORCH_CHECK(num_heads % num_heads_k == 0, "Number of heads in key/value must divide number of heads in query");

Expand Down Expand Up @@ -1164,7 +1164,7 @@ mha_fwd_kvcache(at::Tensor &q, // batch_size x seqlen_q x num_he
const int seqlen_k = kcache.size(1);
const int num_heads_k = kcache.size(2);
const int batch_size_c = kcache.size(0);
TORCH_CHECK(batch_size > 0, "batch size must be postive");
TORCH_CHECK(batch_size > 0, "batch size must be positive");
TORCH_CHECK(head_size_og <= 256, "FlashAttention forward only supports head dimension at most 256");
TORCH_CHECK(num_heads % num_heads_k == 0, "Number of heads in key/value must divide number of heads in query");

Expand Down
2 changes: 1 addition & 1 deletion tch-cuda/kernels/flash_attn/flash_fwd_kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ inline __device__ void combine_attn_seqk_parallel(const Params &params) {
Shape<Int<kBlockM>>{}, Stride<_1>{});
constexpr int kNLsePerThread = (kMaxSplits * kBlockM + kNThreads - 1) / kNThreads;

// Read the LSE values from gmem and store them in shared memory, then tranpose them.
// Read the LSE values from gmem and store them in shared memory, then transpose them.
constexpr int kRowsPerLoadLSE = kNThreads / kBlockM;
#pragma unroll
for (int l = 0; l < kNLsePerThread; ++l) {
Expand Down
2 changes: 1 addition & 1 deletion tch-cuda/kernels/flash_attn/kernel_traits.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ struct Flash_fwd_kernel_traits : public Base {
Layout<Shape < _1, _8>>{})); // Val layout, 8 vals per load
};

// Is_V_in_regs is an option to reduce smem usage, but will increase register pressue.
// Is_V_in_regs is an option to reduce smem usage, but will increase register pressure.
// No_double_buffer is another option to reduce smem usage, but will slow things down.
template<int kHeadDim_, int kBlockM_, int kBlockN_, int kNWarps_,
int AtomLayoutMSdP_=1, int AtomLayoutNdKV=2, int AtomLayoutMdQ=2,
Expand Down
10 changes: 5 additions & 5 deletions tutorials/promptlib_examples/information_flow_examples.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"\n",
"We show a simple 2-step security example, where we want to ensure that pre-identified security-critical decisions are not directly influenced by untrusted data. We'll start with a user command (e.g., \"summarize this web page and email me the result\"). \n",
"\n",
"We'll setup an example where the raw web page includes an XPIA attack to send money to a hacker. For this exmaple, we'll make sure there's a bank transfer plugin.\n"
"We'll setup an example where the raw web page includes an XPIA attack to send money to a hacker. For this example, we'll make sure there's a bank transfer plugin.\n"
]
},
{
Expand All @@ -62,7 +62,7 @@
"You have access to the following tools:\n",
"\n",
"AddToDo: adds text to the user's to-do list.\n",
"SendEmail: useful for when you want to send an email to a specfied user\n",
"SendEmail: useful for when you want to send an email to a specified user\n",
"SendPayment: useful for when you want to send a payment via bank transfer, venmo, etc to a specified user\n",
"\n",
"Think carefully when deciding how to use a tool. Follow the following procedure:\n",
Expand Down Expand Up @@ -160,7 +160,7 @@
"You have access to the following tools:\n",
"\n",
"AddToDo: adds text to the user's to-do list.\n",
"SendEmail: useful for when you want to send an email to a specfied user\n",
"SendEmail: useful for when you want to send an email to a specified user\n",
"SendPayment: useful for when you want to send a payment via bank transfer, venmo, etc to a specified user\n",
"\n",
"Think carefully when deciding how to use a tool. Follow the following procedure:\n",
Expand Down Expand Up @@ -218,7 +218,7 @@
"You have access to the following tools:\n",
"\n",
"AddToDo: adds text to the user's to-do list.\n",
"SendEmail: useful for when you want to send an email to a specfied user\n",
"SendEmail: useful for when you want to send an email to a specified user\n",
"SendPayment: useful for when you want to send a payment via bank transfer, venmo, etc to a specified user\n",
"\n",
"Think carefully when deciding how to use a tool. Follow the following procedure:\n",
Expand Down Expand Up @@ -275,7 +275,7 @@
"You have access to the following tools:\n",
"\n",
"AddToDo: adds text to the user's to-do list.\n",
"SendEmail: useful for when you want to send an email to a specfied user\n",
"SendEmail: useful for when you want to send an email to a specified user\n",
"SendPayment: useful for when you want to send a payment via bank transfer, venmo, etc to a specified user\n",
"\n",
"Think carefully when deciding how to use a tool. Follow the following procedure:\n",
Expand Down
Loading